upgrade to 0.10
svn path=/nixpkgs/trunk/; revision=6679
This commit is contained in:
parent
7ac4f700a3
commit
22dbea9161
@ -8,13 +8,12 @@ assert aterm != null && bdb != null && perl != null;
|
||||
# assert aterm.version >= 2.0
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nix-0.9.2";
|
||||
name = "nix-0.10";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/nix/nix-0.9.2/nix-0.9.2.tar.bz2;
|
||||
md5 = "fc3a24f72760e357ac29935b2aebce0b";
|
||||
url = http://nix.cs.uu.nl/dist/nix/nix-0.10/nix-0.10.tar.bz2;
|
||||
md5 = "2e5db8be894b28873b5bb1b25194955f";
|
||||
};
|
||||
buildInputs = [aterm bdb perl curl];
|
||||
patches = [./nix-profile-0.9.2.patch];
|
||||
inherit storeDir stateDir aterm bdb;
|
||||
}
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -ruN nix-0.9.2/scripts/nix-profile.sh.in nix-0.9.2.new/scripts/nix-profile.sh.in
|
||||
--- nix-0.9.2/scripts/nix-profile.sh.in 2005-09-21 20:29:43.000000000 +0200
|
||||
+++ nix-0.9.2.new/scripts/nix-profile.sh.in 2005-10-11 18:44:57.000000000 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
if ! test -L "$NIX_LINK"; then
|
||||
echo "creating $NIX_LINK"
|
||||
_NIX_DEF_LINK=@localstatedir@/nix/profiles/default
|
||||
- ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
|
||||
+ @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
|
||||
fi
|
||||
|
||||
export PATH=$NIX_LINK/bin:@prefix@/bin:$PATH
|
Loading…
Reference in New Issue
Block a user