diff options
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/vim/qvim.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.5/dragonegg.nix | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 6910f13bb36a..94ae1d9c846a 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -31,10 +31,6 @@ let inherit (args.composableDerivation) composableDerivation edf; ''; in composableDerivation { - # use gccApple to compile on darwin - mkDerivation = ( if stdenv.isDarwin - then stdenvAdapters.overrideCC stdenv gccApple - else stdenv ).mkDerivation; } (fix: { name = "vim_configurable-7.4.516"; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 8c87d3c1e20c..b9e3d668d623 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -6,10 +6,6 @@ in let inherit (args.composableDerivation) composableDerivation edf; in composableDerivation { - # use gccApple to compile on darwin - mkDerivation = ( if stdenv.isDarwin - then stdenvAdapters.overrideCC stdenv gccApple - else stdenv ).mkDerivation; } (fix: { name = "qvim-7.4." + tag; diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix index 89351842cd2a..0f2d4cd7fb67 100644 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -1,4 +1,4 @@ -{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, mpc, ncurses, zlib, version}: +{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: stdenv.mkDerivation rec { name = "dragonegg-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # The gcc the plugin will be built for (the same used building dragonegg) GCC = "gcc"; - buildInputs = [ llvm gmp mpfr mpc ncurses zlib ]; + buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ]; installPhase = '' mkdir -p $out/lib $out/share/doc/${name} |