diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-08 21:24:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-08 21:24:48 +0200 |
| commit | 65a9fa8cdccdd7cf4737d0362789d25cc824400d (patch) | |
| tree | bd109a65b1cd166d44eff9f6acd22cc7c1b60fde /pkgs/applications/networking/browsers/firefox-bin | |
| parent | 62fc8859c10dd18b005b9bcaa0b429103d7661d9 (diff) | |
| parent | 6054c9f217a8db8219d5a63bcb2c275bc13962f0 (diff) | |
| download | nixlib-65a9fa8cdccdd7cf4737d0362789d25cc824400d.tar nixlib-65a9fa8cdccdd7cf4737d0362789d25cc824400d.tar.gz nixlib-65a9fa8cdccdd7cf4737d0362789d25cc824400d.tar.bz2 nixlib-65a9fa8cdccdd7cf4737d0362789d25cc824400d.tar.lz nixlib-65a9fa8cdccdd7cf4737d0362789d25cc824400d.tar.xz nixlib-65a9fa8cdccdd7cf4737d0362789d25cc824400d.tar.zst nixlib-65a9fa8cdccdd7cf4737d0362789d25cc824400d.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox-bin')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 3b653d9d871b..d284296d3d93 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -138,6 +138,9 @@ stdenv.mkDerivation { patchelf --set-rpath "$libPath" \ "$out/usr/lib/firefox-bin-${version}/{}" \; + # wrapFirefox expects "$out/lib" instead of "$out/usr/lib" + ln -s "$out/usr/lib" "$out/lib" + # Create a desktop item. mkdir -p $out/share/applications cat > $out/share/applications/firefox.desktop <<EOF |