diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-02-21 16:23:04 -0500 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-02-21 16:23:04 -0500 |
| commit | 5a31378291262030564ee42f2ea676c13dfb0943 (patch) | |
| tree | cfe34a9d517fa758a264218ed542be0a2f9f36c7 /pkgs/development/libraries/xdg-desktop-portal | |
| parent | a5837865c0fab46d2000a0b5cb87faa273e4b9db (diff) | |
| download | nixpkgs-5a31378291262030564ee42f2ea676c13dfb0943.tar nixpkgs-5a31378291262030564ee42f2ea676c13dfb0943.tar.gz nixpkgs-5a31378291262030564ee42f2ea676c13dfb0943.tar.bz2 nixpkgs-5a31378291262030564ee42f2ea676c13dfb0943.tar.lz nixpkgs-5a31378291262030564ee42f2ea676c13dfb0943.tar.xz nixpkgs-5a31378291262030564ee42f2ea676c13dfb0943.tar.zst nixpkgs-5a31378291262030564ee42f2ea676c13dfb0943.zip | |
xdg-desktop-portal: fix paths
Diffstat (limited to 'pkgs/development/libraries/xdg-desktop-portal')
| -rw-r--r-- | pkgs/development/libraries/xdg-desktop-portal/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 22b3713dd57..0fdcb684b2d 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }: +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; @@ -15,10 +15,14 @@ stdenv.mkDerivation rec { patches = [ ./respect-path-env-var.patch + (substituteAll { + src = ./fix-paths.patch; + inherit flatpak; + }) ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gsettings-desktop-schemas ]; doCheck = true; # XXX: investigate! diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch new file mode 100644 index 00000000000..f4b103eb38b --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/notification.c b/src/notification.c +index 1367114..72ba033 100644 +--- a/src/notification.c ++++ b/src/notification.c +@@ -401,7 +401,7 @@ validate_icon_more (GVariant *v) + int status; + g_autofree char *err = NULL; + g_autoptr(GError) error = NULL; +- const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon"; ++ const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon"; + const char *args[6]; + + if (G_IS_THEMED_ICON (icon)) |