diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/xdg-desktop-portal | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/xdg-desktop-portal')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix | 30 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch | 13 |
2 files changed, 18 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index 19a671e7e0b0..05b0f5534481 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -5,7 +5,8 @@ , fetchFromGitHub , fetchpatch , flatpak -, fuse +, fuse3 +, systemdMinimal , geoclue2 , glib , gsettings-desktop-schemas @@ -14,6 +15,9 @@ , libxml2 , nixosTests , pipewire +, gdk-pixbuf +, librsvg +, python3 , pkg-config , stdenv , substituteAll @@ -23,7 +27,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.12.1"; + version = "1.15.0"; outputs = [ "out" "installedTests" ]; @@ -31,17 +35,9 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1fc3LXN6wp/zQw4HQ0Q99HUvBhynHrQi2p3s/08izuE="; + sha256 = "sha256-Kw3zJeGwPfw1fDo8HsgYmrpgCk/PUvWZPRloKJNAJVc="; }; - patches = [ - # Hardcode paths used by x-d-p itself. - (substituteAll { - src = ./fix-paths.patch; - inherit flatpak; - }) - ]; - nativeBuildInputs = [ autoreconfHook libxml2 @@ -53,12 +49,22 @@ 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 + ])) ] ++ lib.optionals enableGeoLocation [ geoclue2 ]; diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch deleted file mode 100644 index 98e26e88b5ce..000000000000 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch +++ /dev/null @@ -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)) |