From b4bee8caf5a282cae972c5b25eea05b00fb31253 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 25 Feb 2012 20:18:00 +0000 Subject: [PATCH] nixUnstable: Run checkPhase after installPhase to work around a test suite bug svn path=/nixpkgs/trunk/; revision=32567 --- pkgs/tools/package-management/nix/unstable.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 175ae0693820..7ad69e8353a9 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,7 +4,7 @@ , stateDir ? "/nix/var" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "nix-1.0pre31851"; src = fetchurl { @@ -51,4 +51,6 @@ stdenv.mkDerivation rec { 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"; +})