* Use ATerm 2.5 for Nix.

svn path=/nixpkgs/trunk/; revision=20197
This commit is contained in:
Eelco Dolstra 2010-02-23 16:14:21 +00:00
parent 7cbff16472
commit a4d524eb8b

View File

@ -8937,8 +8937,7 @@ let
}; };
nix = makeOverridable (import ../tools/package-management/nix) { nix = makeOverridable (import ../tools/package-management/nix) {
inherit fetchurl stdenv perl curl bzip2 openssl; inherit fetchurl stdenv perl curl bzip2 openssl aterm;
aterm = aterm242fixes;
storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
}; };
@ -8947,8 +8946,7 @@ let
nixUnstable = nix; nixUnstable = nix;
/* /*
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
inherit fetchurl stdenv perl curl bzip2 openssl; inherit fetchurl stdenv perl curl bzip2 openssl aterm;
aterm = aterm242fixes;
storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
}; };