Author: shlevy
Date: Sat Feb 25 20:18:00 2012
New Revision: 32567
URL: https://nixos.org/websvn/nix/?rev=32567&sc=1
Log:
nixUnstable: Run checkPhase after installPhase to work around a test suite bug
Modified:
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Sat Feb
25 20:11:04 2012 (r32566)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Sat Feb
25 20:18:00 2012 (r32567)
@@ -4,7 +4,7 @@
, stateDir ? "/nix/var"
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
name = "nix-1.0pre31851";
src = fetchurl {
@@ -51,4 +51,6 @@
homepage = http://nixos.org/;
license = "LGPLv2+";
};
-}
+} // stdenv.lib.optionalAttrs stdenv.isDarwin {
+ phases = "$prePhases unpackPhase patchPhase $preConfigurePhases
configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase
checkPhase fixupPhase $preDistPhases distPhase $postPhases";
+})
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
