diff options
| author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-26 21:04:25 -0300 |
|---|---|---|
| committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-26 21:04:25 -0300 |
| commit | ed2b1b4b909538716abb6378971ba75fae65b7d2 (patch) | |
| tree | 25c9f8f505f3ad7d3955c556a50ef6c111e7c369 /pkgs/development/libraries/xdg-desktop-portal/default.nix | |
| parent | f68dbdc7c39faa5f685e34b10da0b373ad6a7c22 (diff) | |
| parent | 2970b27faf15840714feba50186e7e02d945569f (diff) | |
| download | nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.gz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.bz2 nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.lz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.xz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.zst nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/libraries/xdg-desktop-portal/default.nix')
| -rw-r--r-- | pkgs/development/libraries/xdg-desktop-portal/default.nix | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 16ede7f511f..19a671e7e0b 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,22 +1,24 @@ -{ stdenv -, lib -, fetchFromGitHub -, nixosTests -, substituteAll -, autoreconfHook -, pkg-config -, libxml2 -, glib -, pipewire -, flatpak -, gsettings-desktop-schemas +{ lib , acl +, autoreconfHook , dbus +, fetchFromGitHub +, fetchpatch +, flatpak , fuse -, libportal , geoclue2 +, glib +, gsettings-desktop-schemas , json-glib +, libportal +, libxml2 +, nixosTests +, pipewire +, pkg-config +, stdenv +, substituteAll , wrapGAppsHook +, enableGeoLocation ? true }: stdenv.mkDerivation rec { @@ -42,26 +44,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkg-config libxml2 + pkg-config wrapGAppsHook ]; buildInputs = [ - glib - pipewire - flatpak acl dbus - geoclue2 + flatpak fuse - libportal + glib gsettings-desktop-schemas json-glib + libportal + pipewire + ] ++ lib.optionals enableGeoLocation [ + geoclue2 ]; configureFlags = [ "--enable-installed-tests" + ] ++ lib.optionals (!enableGeoLocation) [ + "--disable-geoclue" ]; makeFlags = [ |