diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-04 22:09:15 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-04 22:10:24 +0200 |
| commit | 700d6186a30e9e8118a6b319f12cb5cfb9d086bd (patch) | |
| tree | 77c3f102afd91574249f8910993eab9079ff68a5 /pkgs/applications/networking/browsers/firefox/wrapper.nix | |
| parent | 6d3cc8c27f82d21c87afed0440057405d1fd7432 (diff) | |
| download | nixlib-700d6186a30e9e8118a6b319f12cb5cfb9d086bd.tar nixlib-700d6186a30e9e8118a6b319f12cb5cfb9d086bd.tar.gz nixlib-700d6186a30e9e8118a6b319f12cb5cfb9d086bd.tar.bz2 nixlib-700d6186a30e9e8118a6b319f12cb5cfb9d086bd.tar.lz nixlib-700d6186a30e9e8118a6b319f12cb5cfb9d086bd.tar.xz nixlib-700d6186a30e9e8118a6b319f12cb5cfb9d086bd.tar.zst nixlib-700d6186a30e9e8118a6b319f12cb5cfb9d086bd.zip | |
wrapFirefox: fix #25505 gtk3 file dialogs
Crash + icons.
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/wrapper.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f2ca9eaa622b..cffdfa7a97dd 100644 --- 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" |