diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-02-26 23:32:33 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-02-26 23:32:33 +0000 |
commit | 1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5 (patch) | |
tree | cba73be7e3108dca51f75c9ec44a8bd61246b11a /nixpkgs/pkgs/development/libraries/xdg-desktop-portal | |
parent | db8291322dd83add2250dd4480b46298655cbfba (diff) | |
parent | 1233c8d9e9bc463899ed6a8cf0232e6bf36475ee (diff) | |
download | nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.gz nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.bz2 nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.lz nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.xz nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.zst nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.zip |
Merge commit '1233c8d9e9bc463899ed6a8cf0232e6bf36475ee'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/xdg-desktop-portal')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix | 15 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch | 13 |
2 files changed, 20 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index 80699188fe2e..0fdcb684b2d5 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,8 +1,8 @@ -{ 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"; - version = "1.1.0"; + version = "1.2.0"; outputs = [ "out" "installedTests" ]; @@ -10,20 +10,19 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx"; + sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71"; }; patches = [ ./respect-path-env-var.patch - # https://github.com/flatpak/xdg-desktop-portal/pull/263 - (fetchpatch { - url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch; - sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq"; + (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/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch new file mode 100644 index 000000000000..f4b103eb38b1 --- /dev/null +++ b/nixpkgs/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)) |