firefox: fix argv0 with enableGTK3 (/cc #9562)
Also add a simple test detecting such problems.
This commit is contained in:
parent
4ab89ab1e6
commit
f65b692a07
pkgs/applications/networking/browsers/firefox
|
@ -97,10 +97,16 @@ stdenv.mkDerivation rec {
|
||||||
# Remove SDK cruft. FIXME: move to a separate output?
|
# Remove SDK cruft. FIXME: move to a separate output?
|
||||||
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
|
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
|
||||||
'' + lib.optionalString enableGTK3
|
'' + lib.optionalString enableGTK3
|
||||||
|
# argv[0] must point to firefox itself
|
||||||
''
|
''
|
||||||
wrapProgram "$out/bin/firefox" \
|
wrapProgram "$out/bin/firefox" \
|
||||||
|
--argv0 "$out/bin/.firefox-wrapped" \
|
||||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
|
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
|
||||||
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
||||||
|
'' +
|
||||||
|
# some basic testing
|
||||||
|
''
|
||||||
|
"$out/bin/firefox" --version
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
Loading…
Reference in New Issue