public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix evaluation

Browse Source
This commit is contained in:
Eric Seidel 2015-02-03 14:26:16 -08:00
parent dbf3d31727
commit fe49487a05
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/vim/configurable.nix
View File

@ -31,10 +31,6 @@ let inherit (args.composableDerivation) composableDerivation edf;
''; '';
in in
composableDerivation { composableDerivation {
# use gccApple to compile on darwin
mkDerivation = ( if stdenv.isDarwin
then stdenvAdapters.overrideCC stdenv gccApple
else stdenv ).mkDerivation;
} (fix: { } (fix: {
name = "vim_configurable-7.4.516"; name = "vim_configurable-7.4.516";

4
pkgs/applications/editors/vim/qvim.nix
View File

@ -6,10 +6,6 @@ in
let inherit (args.composableDerivation) composableDerivation edf; in let inherit (args.composableDerivation) composableDerivation edf; in
composableDerivation { composableDerivation {
# use gccApple to compile on darwin
mkDerivation = ( if stdenv.isDarwin
then stdenvAdapters.overrideCC stdenv gccApple
else stdenv ).mkDerivation;
} (fix: { } (fix: {
name = "qvim-7.4." + tag; name = "qvim-7.4." + tag;

4
pkgs/development/compilers/llvm/3.5/dragonegg.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "dragonegg-${version}"; name = "dragonegg-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# The gcc the plugin will be built for (the same used building dragonegg) # The gcc the plugin will be built for (the same used building dragonegg)
GCC = "gcc"; GCC = "gcc";
buildInputs = [ llvm gmp mpfr mpc ncurses zlib ]; buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ];
installPhase = '' installPhase = ''
mkdir -p $out/lib $out/share/doc/${name} mkdir -p $out/lib $out/share/doc/${name}