diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:59:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:59:53 +0200 |
| commit | 4ea21ac6fbdf977fd0069f9ad8669103ebe94105 (patch) | |
| tree | a92c066365ddfd5dfb8a6172d9bfbb6fb21b4808 | |
| parent | 14aa936ec52cc01c0b67470bf83b7b0b9aad6aef (diff) | |
| download | nixlib-4ea21ac6fbdf977fd0069f9ad8669103ebe94105.tar nixlib-4ea21ac6fbdf977fd0069f9ad8669103ebe94105.tar.gz nixlib-4ea21ac6fbdf977fd0069f9ad8669103ebe94105.tar.bz2 nixlib-4ea21ac6fbdf977fd0069f9ad8669103ebe94105.tar.lz nixlib-4ea21ac6fbdf977fd0069f9ad8669103ebe94105.tar.xz nixlib-4ea21ac6fbdf977fd0069f9ad8669103ebe94105.tar.zst nixlib-4ea21ac6fbdf977fd0069f9ad8669103ebe94105.zip | |
firefox: finish adding default for execdir
0c633ccf26 just wasn't complete. Now evaluation works for me again.
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6c85c56d691d..b64a6cf7ad98 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -111,11 +111,11 @@ let '' + '' if [ ! -x "${browser}${browser.execdir or "/bin"}/${browserName}" ] then - echo "cannot find executable file \`${browser}${browser.execdir}/${browserName}'" + echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'" exit 1 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}" \ --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix LD_LIBRARY_PATH ':' "$libs" \ |