Jan Tojnar 2 years ago
parent 30e045f599
commit c3b07a052f
  1. 24
      pkgs/development/libraries/xdg-desktop-portal/default.nix
  2. 13
      pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch

@ -5,7 +5,8 @@
, fetchFromGitHub
, fetchpatch
, flatpak
, fuse
, fuse3
, systemdMinimal
, geoclue2
, glib
, gsettings-desktop-schemas
@ -14,6 +15,8 @@
, libxml2
, nixosTests
, pipewire
, gdk-pixbuf
, librsvg
, python3
, pkg-config
, stdenv
@ -24,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal";
version = "1.12.1";
version = "1.14.3";
outputs = [ "out" "installedTests" ];
@ -32,17 +35,9 @@ stdenv.mkDerivation rec {
owner = "flatpak";
repo = pname;
rev = version;
sha256 = "1fc3LXN6wp/zQw4HQ0Q99HUvBhynHrQi2p3s/08izuE=";
sha256 = "CDqTQQ8dOatOxDKR+HiVQgSJKxH6ZstskKdR84U/870=";
};
patches = [
# Hardcode paths used by x-d-p itself.
(substituteAll {
src = ./fix-paths.patch;
inherit flatpak;
})
];
nativeBuildInputs = [
autoreconfHook
libxml2
@ -54,13 +49,18 @@ stdenv.mkDerivation rec {
acl
dbus
flatpak
fuse
fuse3
systemdMinimal # libsystemd
glib
gsettings-desktop-schemas
json-glib
libportal
pipewire
# For icon validator
gdk-pixbuf
librsvg
# For document-fuse installed test.
(python3.withPackages (pp: with pp; [
pygobject3

@ -1,13 +0,0 @@
diff --git a/src/notification.c b/src/notification.c
index 5412609..4243e98 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -366,7 +366,7 @@
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))
Loading…
Cancel
Save