JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xdg-desktop-portal: fix paths

Browse Source
This commit is contained in:
worldofpeace 2019-02-21 16:23:04 -05:00
parent a5837865c0
commit 5a31378291
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/xdg-desktop-portal/default.nix
View File

@ -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!

13
pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch Normal file
View File

@ -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))