diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-07 23:03:28 +0100 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-10 12:55:22 -0500 |
| commit | a10d38d901742364e2a2ddc3226a1218a14b8c53 (patch) | |
| tree | 394333e792574200acd611480ef47259e874284c /pkgs/development/libraries/xdg-desktop-portal | |
| parent | 9ecb58bfcba668b9d5da141ac5ca6346511882df (diff) | |
| download | nixpkgs-a10d38d901742364e2a2ddc3226a1218a14b8c53.tar nixpkgs-a10d38d901742364e2a2ddc3226a1218a14b8c53.tar.gz nixpkgs-a10d38d901742364e2a2ddc3226a1218a14b8c53.tar.bz2 nixpkgs-a10d38d901742364e2a2ddc3226a1218a14b8c53.tar.lz nixpkgs-a10d38d901742364e2a2ddc3226a1218a14b8c53.tar.xz nixpkgs-a10d38d901742364e2a2ddc3226a1218a14b8c53.tar.zst nixpkgs-a10d38d901742364e2a2ddc3226a1218a14b8c53.zip | |
xdg-desktop-portal: Clean up
Diffstat (limited to 'pkgs/development/libraries/xdg-desktop-portal')
| -rw-r--r-- | pkgs/development/libraries/xdg-desktop-portal/default.nix | 49 |
1 files changed, 44 insertions, 5 deletions
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index d16c5d670e5..22bbfb5358a 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,4 +1,22 @@ -{ stdenv, fetchFromGitHub, nixosTests, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, nixosTests +, substituteAll +, autoreconfHook +, pkgconfig +, libxml2 +, glib +, pipewire +, fontconfig +, flatpak +, gsettings-desktop-schemas +, acl +, dbus +, fuse +, geoclue2 +, json-glib +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; @@ -14,15 +32,36 @@ stdenv.mkDerivation rec { }; patches = [ + # Allow loading portals from different path than prefix (since that is immutable). + # We pass XDG_DESKTOP_PORTAL_PATH environment variable to the systemd service to achieve that. ./respect-path-env-var.patch + + # Hardcode paths used by x-d-p itself. (substituteAll { src = ./fix-paths.patch; inherit flatpak; }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + libxml2 + wrapGAppsHook + ]; + + buildInputs = [ + glib + pipewire + fontconfig + flatpak + acl + dbus + geoclue2 + fuse + gsettings-desktop-schemas + json-glib + ]; doCheck = true; # XXX: investigate! @@ -31,8 +70,8 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "installed_testdir=$(installedTests)/libexec/installed-tests/xdg-desktop-portal" - "installed_test_metadir=$(installedTests)/share/installed-tests/xdg-desktop-portal" + "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal" + "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/xdg-desktop-portal" ]; passthru = { |