diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-01 21:00:30 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-01 21:00:30 +0000 |
commit | be901fa8befb762928e2c2f7805ce98c76dc2c53 (patch) | |
tree | 1c7013f0d9f1e183e7e811e69ebaf0458c68ec89 /pkgs/tools/package-management | |
parent | 661d16d3fe5268be8ee442c4827c393bf462efac (diff) | |
download | nixlib-be901fa8befb762928e2c2f7805ce98c76dc2c53.tar nixlib-be901fa8befb762928e2c2f7805ce98c76dc2c53.tar.gz nixlib-be901fa8befb762928e2c2f7805ce98c76dc2c53.tar.bz2 nixlib-be901fa8befb762928e2c2f7805ce98c76dc2c53.tar.lz nixlib-be901fa8befb762928e2c2f7805ce98c76dc2c53.tar.xz nixlib-be901fa8befb762928e2c2f7805ce98c76dc2c53.tar.zst nixlib-be901fa8befb762928e2c2f7805ce98c76dc2c53.zip |
* Add an installCheckPhase.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33967
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index edce730d73b8..ce62eb1e5621 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { CFLAGS=-O3 CXXFLAGS=-O3 ''; + doInstallCheck = true; + crossAttrs = { postUnpack = '' export CPATH="${bzip2.hostDrv}/include" @@ -51,14 +53,11 @@ stdenv.mkDerivation rec { '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; - doCheck = false; - postInstall = ":"; + doInstallCheck = false; }; enableParallelBuilding = true; - postInstall = "make installcheck"; - meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; |