diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-04-16 22:35:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-16 22:35:43 +0200 |
| commit | 91a9000cba780dd4541234c0c6143e8b965b572f (patch) | |
| tree | 974f922af5077c3f6ff130411d2e58119f7e1443 | |
| parent | e536e89830d237596a3ae463ee3a78c5aca31c1e (diff) | |
| parent | 752e176d67e41b6b1d2da20a0c9c70079fe56a60 (diff) | |
| download | nixpkgs-91a9000cba780dd4541234c0c6143e8b965b572f.tar nixpkgs-91a9000cba780dd4541234c0c6143e8b965b572f.tar.gz nixpkgs-91a9000cba780dd4541234c0c6143e8b965b572f.tar.bz2 nixpkgs-91a9000cba780dd4541234c0c6143e8b965b572f.tar.lz nixpkgs-91a9000cba780dd4541234c0c6143e8b965b572f.tar.xz nixpkgs-91a9000cba780dd4541234c0c6143e8b965b572f.tar.zst nixpkgs-91a9000cba780dd4541234c0c6143e8b965b572f.zip | |
Merge pull request #59665 from hedning/flatpak-fix-pixbuf-leakage
flatpak: clear GDK_PIXBUF_MODULE_FILE
| -rw-r--r-- | pkgs/development/libraries/flatpak/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/flatpak/unset-env-vars.patch | 10 |
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[] = { |