From 752e176d67e41b6b1d2da20a0c9c70079fe56a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 16 Apr 2019 04:47:23 +0200 Subject: [PATCH] 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 --- pkgs/development/libraries/flatpak/default.nix | 1 + .../development/libraries/flatpak/unset-env-vars.patch | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/libraries/flatpak/unset-env-vars.patch 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[] = {