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/stdenv/adapters.nix | |
parent | ce100a5d58799e65684ad948db70638c311369b3 (diff) | |
download | nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.gz nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.bz2 nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.lz nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.xz nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.zst nixlib-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/stdenv/adapters.nix')
-rw-r--r-- | pkgs/stdenv/adapters.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 3917f63563aa..c50db3bc04d2 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -8,7 +8,7 @@ rec { # Override the compiler in stdenv for specific packages. - overrideGCC = stdenv: gcc: stdenv.override { allowedRequisites = null; inherit gcc; }; + overrideGCC = stdenv: gcc: stdenv.override { allowedRequisites = null; cc = gcc; }; # Add some arbitrary packages to buildInputs for specific packages. @@ -235,9 +235,4 @@ rec { }); }; - dropCxx = drv: drv.override { - stdenv = if pkgs.stdenv.isDarwin - then pkgs.allStdenvs.stdenvDarwinNaked - else pkgs.stdenv; - }; } |