diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-12-17 12:11:30 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-12-26 11:06:21 -0600 |
| commit | 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (patch) | |
| tree | 1931763370f483739474ebe0ab219eb0d7256c13 /pkgs/applications/networking/browsers/firefox-bin/default.nix | |
| parent | ce100a5d58799e65684ad948db70638c311369b3 (diff) | |
| download | nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.gz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.bz2 nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.lz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.xz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.zst nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.zip | |
Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet this change is also compatible with Linux.
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox-bin/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 3f85467fe31..c9956497b10 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc + [ stdenv.cc.gcc alsaLib atk cairo @@ -106,7 +106,7 @@ stdenv.mkDerivation { pulseaudio systemd ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.gcc.gcc + stdenv.cc.gcc ]; # "strip" after "patchelf" may break binaries. @@ -125,7 +125,7 @@ stdenv.mkDerivation { firefox mozilla-xremote-client firefox-bin plugin-container \ updater crashreporter webapprt-stub do - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$out/usr/lib/firefox-bin-${version}/$executable" done |