diff options
| author | Shea Levy <shea@shealevy.com> | 2012-02-25 20:52:15 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-02-25 20:52:15 +0000 |
| commit | 584ccabaac181f1f01c39bff5291612e111baf4e (patch) | |
| tree | a460af26a5295083b9ed43234433359c16f31760 /pkgs/tools/package-management | |
| parent | ea195b2507b9068d966009d27c0e90b57d88f30d (diff) | |
| download | nixlib-584ccabaac181f1f01c39bff5291612e111baf4e.tar nixlib-584ccabaac181f1f01c39bff5291612e111baf4e.tar.gz nixlib-584ccabaac181f1f01c39bff5291612e111baf4e.tar.bz2 nixlib-584ccabaac181f1f01c39bff5291612e111baf4e.tar.lz nixlib-584ccabaac181f1f01c39bff5291612e111baf4e.tar.xz nixlib-584ccabaac181f1f01c39bff5291612e111baf4e.tar.zst nixlib-584ccabaac181f1f01c39bff5291612e111baf4e.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32569
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 6 |
1 files 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"; +}) |