diff options
author | Eric Seidel <gridaphobe@gmail.com> | 2015-01-09 11:22:12 -0800 |
---|---|---|
committer | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:26:56 -0800 |
commit | 48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60 (patch) | |
tree | 6081b12a343a31bcc0dcf3f50b3a891f80d12bb1 /pkgs/applications/editors/vim | |
parent | e38c351f2b06f866537a3d584d1f9b95bdf25a0e (diff) | |
download | nixpkgs-48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60.tar nixpkgs-48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60.tar.gz nixpkgs-48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60.tar.bz2 nixpkgs-48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60.tar.lz nixpkgs-48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60.tar.xz nixpkgs-48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60.tar.zst nixpkgs-48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60.zip |
rename gcc-wrapper to cc-wrapper.
also makes cc-wrapper compatible with clang in the darwin fork.
Diffstat (limited to 'pkgs/applications/editors/vim')
-rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/qvim.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index d5b7182c64a..6910f13bb36 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -33,7 +33,7 @@ in composableDerivation { # use gccApple to compile on darwin mkDerivation = ( if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple + then stdenvAdapters.overrideCC stdenv gccApple else stdenv ).mkDerivation; } (fix: { diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 5d1a8a6f141..8c87d3c1e20 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -8,7 +8,7 @@ let inherit (args.composableDerivation) composableDerivation edf; in composableDerivation { # use gccApple to compile on darwin mkDerivation = ( if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple + then stdenvAdapters.overrideCC stdenv gccApple else stdenv ).mkDerivation; } (fix: { |