From 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 17 Dec 2014 12:11:30 -0600 Subject: 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. --- pkgs/stdenv/adapters.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'pkgs/stdenv/adapters.nix') 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; - }; } -- cgit 1.4.1