Merge staging-next into staging

2019-04-18 08:26:30 +02:00
parent 5b7f58701c 9d87ccabce
commit 2346182c2c
137 changed files with 5782 additions and 2601 deletions
--- 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 = [
--- a/pkgs/development/libraries/flatpak/unset-env-vars.patch
+++ 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[] = {