From 46e1c7f17aafaab18091f8fe04c1586f4ab932af Mon Sep 17 00:00:00 2001 From: Matthew Harm Bekkema Date: Fri, 14 Jun 2019 21:56:06 +1000 Subject: [PATCH 1/2] flatpak: Preserve pixbuf path in validate-icon SVG support isn't built-in to GdkPixBuf, it's provided by an external module. Therefore, GDK_PIXBUF_MODULE_FILE should be preserved in the sandbox, otherwise `flatpak-validate-icon --sandbox` won't work on SVG files. --- pkgs/development/libraries/flatpak/default.nix | 1 + .../libraries/flatpak/validate-icon-pixbuf.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index aff5737432f5..8b4d6380fd20 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { ./respect-xml-catalog-files-var.patch ./use-flatpak-from-path.patch ./unset-env-vars.patch + ./validate-icon-pixbuf.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch new file mode 100644 index 000000000000..5b8cc2d0383f --- /dev/null +++ b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch @@ -0,0 +1,13 @@ +diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c +index 6e23d9f2..f0659a78 100644 +--- a/icon-validator/validate-icon.c ++++ b/icon-validator/validate-icon.c +@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width, + add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); + if (g_getenv ("G_MESSAGES_PREFIXED")) + add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); ++ if (g_getenv ("GDK_PIXBUF_MODULE_FILE")) ++ add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL); + + add_args (args, validate_icon, arg_width, arg_height, filename, NULL); + g_ptr_array_add (args, NULL); From 0a5a1259ae79f8918a0e0eb8da488ab761a1a587 Mon Sep 17 00:00:00 2001 From: Matthew Harm Bekkema Date: Sat, 15 Jun 2019 15:15:01 +1000 Subject: [PATCH 2/2] flatpak: Make librsvg dependency explicit --- pkgs/development/libraries/flatpak/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 8b4d6380fd20..4ea17e588a9b 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }: stdenv.mkDerivation rec { pname = "flatpak"; @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp libsoup lzma ostree polkit python3 systemd xorg.libXau gsettings-desktop-schemas glib-networking + librsvg # for flatpak-validate-icon ]; checkInputs = [ valgrind ];