mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

wrapFirefox: fix #25505 gtk3 file dialogs

Browse source 
Crash + icons.
This commit is contained in:
Vladimír Čunát 2017-05-04 22:09:15 +02:00
parent 6d3cc8c27f
commit 700d6186a3
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -200,6 +200,6 @@ stdenv.mkDerivation (rec {
gtk = gtk2;
inherit nspr;
inherit ffmpegSupport;
};
} // lib.optionalAttrs gtk3Support { inherit gtk3; };
} // overrides)

12
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -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"