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

flatpak: Preserve pixbuf path in validate-icon

Browse Source 
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.
This commit is contained in:
Matthew Harm Bekkema 2019-06-14 21:56:06 +10:00
parent 29dc0ba657
commit 46e1c7f17a
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 = [

13
pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch Normal file
View File

@ -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);