wrapFirefox: fix #25505 gtk3 file dialogs

Crash + icons.

+11 -3
+1 -1
pkgs/applications/networking/browsers/firefox/common.nix
··· 200 200 gtk = gtk2; 201 201 inherit nspr; 202 202 inherit ffmpegSupport; 203 - }; 203 + } // lib.optionalAttrs gtk3Support { inherit gtk3; }; 204 204 205 205 } // overrides)
+10 -2
pkgs/applications/networking/browsers/firefox/wrapper.nix
··· 74 74 ]; 75 75 }; 76 76 77 - buildInputs = [makeWrapper] ++ lib.optionals (!ffmpegSupport) gst-plugins; 77 + buildInputs = [makeWrapper] 78 + ++ lib.optional (!ffmpegSupport) gst-plugins 79 + ++ lib.optional (browser ? gtk3) browser.gtk3; 78 80 79 81 buildCommand = '' 80 82 if [ ! -x "${browser}/bin/${browserName}" ] ··· 92 94 --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ 93 95 --suffix PATH ':' "$out/bin" \ 94 96 --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ 95 - ${lib.optionalString (!ffmpegSupport) ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''} 97 + ${lib.optionalString (!ffmpegSupport) 98 + ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"'' 99 + + lib.optionalString (browser ? gtk3) 100 + ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ 101 + --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' 102 + '' 103 + } 96 104 97 105 if [ -e "${browser}/share/icons" ]; then 98 106 mkdir -p "$out/share"