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

Merge pull request #54299 from dtzWill/update/xdg-desktop-portal-1.1.1

Browse Source 
xdg-desktop-portal{,-gtk}: 1.1.0 -> 1.2.0
flatpak: 1.1.3 -> 1.2.3
This commit is contained in:
Tor Hedin Brønner 2019-02-25 13:14:01 +01:00 committed by GitHub
commit 3a83ec23dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/flatpak/default.nix
View File

@ -5,14 +5,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flatpak"; pname = "flatpak";
version = "1.1.3"; version = "1.2.3";
# TODO: split out lib once we figure out what to do with triggerdir # TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "man" "doc" "installedTests" ]; outputs = [ "out" "man" "doc" "installedTests" ];
src = fetchurl { src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "12xqhszx50pmw2nx7n1pym7n47z95ddwwkyx35bfgmxsd9hjpmh2"; sha256 = "0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv";
}; };
patches = [ patches = [

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk"; pname = "xdg-desktop-portal-gtk";
version = "1.1.0"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flatpak"; owner = "flatpak";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1djgsp3n10w6lamwwjn64p9722lvxpalj26h19zscbspnhfldb4f"; sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ];

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

@ -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 { stdenv.mkDerivation rec {
pname = "xdg-desktop-portal"; pname = "xdg-desktop-portal";
version = "1.1.0"; version = "1.2.0";
outputs = [ "out" "installedTests" ]; outputs = [ "out" "installedTests" ];
@ -10,20 +10,19 @@ stdenv.mkDerivation rec {
owner = "flatpak"; owner = "flatpak";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx"; sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71";
}; };
patches = [ patches = [
./respect-path-env-var.patch ./respect-path-env-var.patch
# https://github.com/flatpak/xdg-desktop-portal/pull/263 (substituteAll {
(fetchpatch { src = ./fix-paths.patch;
url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch; inherit flatpak;
sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq";
}) })
]; ];
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; 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! 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))