Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10b979ff213d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9cbc7363543e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 14, 2018

  1. Copy the full SHA
    c508887 View commit details
  2. Merge pull request #45019 from garbas/fix-firefox-bin-on-18.03

    firefox-bin: fix for broken icons due to broken symlink
    Mic92 authored Aug 14, 2018
    Copy the full SHA
    9cbc736 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/applications/networking/browsers/firefox-bin/default.nix
4 changes: 4 additions & 0 deletions pkgs/applications/networking/browsers/firefox-bin/default.nix
Original file line number Diff line number Diff line change
@@ -162,6 +162,10 @@ stdenv.mkDerivation {
fi
done
if [ -e "$out/usr/lib/firefox-bin-${version}/" ]; then
ln -s $out/usr/lib/firefox-bin-${version} $out/usr/lib/firefox
fi
find . -executable -type f -exec \
patchelf --set-rpath "$libPath" \
"$out/usr/lib/firefox-bin-${version}/{}" \;