wrapFirefox: fix #25505 gtk3 file dialogs

vcunat · vcunat · commit 700d6186a30e · 2017-05-04T22:10:24.000+02:00
Crash + icons.
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -200,6 +200,6 @@ stdenv.mkDerivation (rec {
     gtk = gtk2;
     inherit nspr;
     inherit ffmpegSupport;
-  };
+  } // lib.optionalAttrs gtk3Support { inherit gtk3; };
 
 } // overrides)
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -74,7 +74,9 @@ in stdenv.mkDerivation {
     ];
   };
 
-  buildInputs = [makeWrapper] ++ lib.optionals (!ffmpegSupport) gst-plugins;
+  buildInputs = [makeWrapper]
+    ++ lib.optional (!ffmpegSupport) gst-plugins
+    ++ lib.optional (browser ? gtk3) browser.gtk3;
 
   buildCommand = ''
     if [ ! -x "${browser}/bin/${browserName}" ]
@@ -92,7 +94,13 @@ in stdenv.mkDerivation {
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
         --suffix PATH ':' "$out/bin" \
         --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
-        ${lib.optionalString (!ffmpegSupport) ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''}
+        ${lib.optionalString (!ffmpegSupport)
+            ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''
+        + lib.optionalString (browser ? gtk3)
+            ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+              --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
+            ''
+         }
 
     if [ -e "${browser}/share/icons" ]; then
         mkdir -p "$out/share"
