From a4d524eb8bd67a227338567d09fa2387f1cb3b3c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Feb 2010 16:14:21 +0000 Subject: [PATCH] * Use ATerm 2.5 for Nix. svn path=/nixpkgs/trunk/; revision=20197 --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4061af7211..d225fb2608f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8937,8 +8937,7 @@ let }; nix = makeOverridable (import ../tools/package-management/nix) { - inherit fetchurl stdenv perl curl bzip2 openssl; - aterm = aterm242fixes; + inherit fetchurl stdenv perl curl bzip2 openssl aterm; storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }; @@ -8947,8 +8946,7 @@ let nixUnstable = nix; /* nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { - inherit fetchurl stdenv perl curl bzip2 openssl; - aterm = aterm242fixes; + inherit fetchurl stdenv perl curl bzip2 openssl aterm; storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; };