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

firefox: finish adding default for execdir

Browse source 
0c633ccf26 just wasn't complete.  Now evaluation works for me again.
This commit is contained in:
Vladimír Čunát 2018-08-17 20:59:53 +02:00
parent 14aa936ec5
commit 4ea21ac6fb
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,11 +111,11 @@ let
'' + '' '' + ''
if [ ! -x "${browser}${browser.execdir or "/bin"}/${browserName}" ] if [ ! -x "${browser}${browser.execdir or "/bin"}/${browserName}" ]
then then
echo "cannot find executable file \`${browser}${browser.execdir}/${browserName}'" echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'"
exit 1 exit 1
fi fi
makeWrapper "$(readlink -v --canonicalize-existing "${browser}${browser.execdir}/${browserName}")" \ makeWrapper "$(readlink -v --canonicalize-existing "${browser}${browser.execdir or "/bin"}/${browserName}")" \
"$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \ "$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \
--suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
--suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix LD_LIBRARY_PATH ':' "$libs" \