diff options
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cabal/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/build-support/release/nix-build.nix | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index d4c823f4a847..7706e849f504 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -1,6 +1,13 @@ # generic builder for Cabal packages -{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, enableLibraryProfiling ? false }: +{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal +, enableLibraryProfiling ? false +, enableCheckPhase ? true +}: + +# The Cabal library shipped with GHC versions older than 7.x doesn't accept the --enable-tests configure flag. +assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion; + { mkDerivation = args : # arguments for the individual package, can modify the defaults @@ -18,6 +25,7 @@ x : (removeAttrs x internalAttrs) // { buildInputs = stdenv.lib.filter (y : ! (y == null)) x.buildInputs; propagatedBuildInputs = stdenv.lib.filter (y : ! (y == null)) x.propagatedBuildInputs; + doCheck = enableCheckPhase && x.doCheck; }; defaults = @@ -92,7 +100,7 @@ # pass the '--enable-tests' flag to cabal in the configure stage # and run any regression test suites the package might have - doCheck = stdenv.lib.versionOlder "7.4" ghc.ghcVersion; + doCheck = enableCheckPhase; extraConfigureFlags = [ (stdenv.lib.enableFeature enableLibraryProfiling "library-profiling") diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 5e4f5dd9ee80..88bafd84faa3 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation ( KEEPBUILDDIR="$out/`basename $TMPDIR`" header "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR - cp -R $TMPDIR/* $KEEPBUILDDIR + cp -R "$TMPDIR/"* $KEEPBUILDDIR stopNest fi fi @@ -68,7 +68,7 @@ stdenv.mkDerivation ( export CFLAGS="-O0" export CXXFLAGS="-O0" fi - ''; # */ + ''; initPhase = '' mkdir -p $out/nix-support |