summary refs log tree commit diff
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2019-04-16 04:47:23 +0200
committerTor Hedin Brønner <torhedinbronner@gmail.com>2019-04-16 04:52:30 +0200
commit752e176d67e41b6b1d2da20a0c9c70079fe56a60 (patch)
treefa204ae4c3c6c0f545a793046c71fc79343f984e
parentc023dd9533c2b552589ec43932cb272c90e0d00f (diff)
downloadnixpkgs-752e176d67e41b6b1d2da20a0c9c70079fe56a60.tar
nixpkgs-752e176d67e41b6b1d2da20a0c9c70079fe56a60.tar.gz
nixpkgs-752e176d67e41b6b1d2da20a0c9c70079fe56a60.tar.bz2
nixpkgs-752e176d67e41b6b1d2da20a0c9c70079fe56a60.tar.lz
nixpkgs-752e176d67e41b6b1d2da20a0c9c70079fe56a60.tar.xz
nixpkgs-752e176d67e41b6b1d2da20a0c9c70079fe56a60.tar.zst
nixpkgs-752e176d67e41b6b1d2da20a0c9c70079fe56a60.zip
flatpak: clear GDK_PIXBUF_MODULE_FILE
GDK_PIXBUF_MODULE_FILE is often set to a nix store path not available in a app
sandbox. This can cause some apps to fail launching, simply reset this env var
when running applications.

fixes https://github.com/NixOS/nixpkgs/issues/53441
-rw-r--r--pkgs/development/libraries/flatpak/default.nix1
-rw-r--r--pkgs/development/libraries/flatpak/unset-env-vars.patch10
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index c3cac531263..a4a0bd1a263 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
     # patch taken from gtk_doc
     ./respect-xml-catalog-files-var.patch
     ./use-flatpak-from-path.patch
+    ./unset-env-vars.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch
new file mode 100644
index 00000000000..798e388b23c
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch
@@ -0,0 +1,10 @@
+--- a/common/flatpak-run.c
++++ b/common/flatpak-run.c
+@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = {
+   {"PERLLIB", NULL},
+   {"PERL5LIB", NULL},
+   {"XCURSOR_PATH", NULL},
++  {"GDK_PIXBUF_MODULE_FILE", NULL},
+ };
+ 
+ static const ExportData no_ld_so_cache_exports[] = {