alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

firefox: fix argv0 with enableGTK3 (/cc #9562)

Browse source 
Also add a simple test detecting such problems.
This commit is contained in:
Vladimír Čunát 2015-09-01 14:30:35 +02:00
parent 4ab89ab1e6
commit f65b692a07
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox/default.nix
View file

@ -97,10 +97,16 @@ stdenv.mkDerivation rec {
# Remove SDK cruft. FIXME: move to a separate output?
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
'' + lib.optionalString enableGTK3
# argv[0] must point to firefox itself
''
wrapProgram "$out/bin/firefox" \
--argv0 "$out/bin/.firefox-wrapped" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
'' +
# some basic testing
''
"$out/bin/firefox" --version
'';
meta = {