diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-11 17:29:37 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-11 17:29:37 +0000 |
| commit | 696f46f73740c177c7fab42a938033014007f4df (patch) | |
| tree | 2b7d738aa34df17a6485e3371ac5d1aa1580bde0 /pkgs/misc/nix | |
| parent | 552de99c19d975a9f66d08c78558f1c2b317cdaa (diff) | |
| download | nixlib-696f46f73740c177c7fab42a938033014007f4df.tar nixlib-696f46f73740c177c7fab42a938033014007f4df.tar.gz nixlib-696f46f73740c177c7fab42a938033014007f4df.tar.bz2 nixlib-696f46f73740c177c7fab42a938033014007f4df.tar.lz nixlib-696f46f73740c177c7fab42a938033014007f4df.tar.xz nixlib-696f46f73740c177c7fab42a938033014007f4df.tar.zst nixlib-696f46f73740c177c7fab42a938033014007f4df.zip | |
add a patch to correctly use coreutils to create a profile. This is needed for NixOS, where we might not know our PATH in advance.
svn path=/nixpkgs/trunk/; revision=4066
Diffstat (limited to 'pkgs/misc/nix')
| -rw-r--r-- | pkgs/misc/nix/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/nix/nix-profile-0.9.2.patch | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix index f79efd4970b4..a77e1c538737 100644 --- a/pkgs/misc/nix/default.nix +++ b/pkgs/misc/nix/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { md5 = "fc3a24f72760e357ac29935b2aebce0b"; }; buildInputs = [aterm bdb perl curl]; + patches = [./nix-profile-0.9.2.patch]; inherit storeDir stateDir aterm bdb; } diff --git a/pkgs/misc/nix/nix-profile-0.9.2.patch b/pkgs/misc/nix/nix-profile-0.9.2.patch new file mode 100644 index 000000000000..9acc802a2a82 --- /dev/null +++ b/pkgs/misc/nix/nix-profile-0.9.2.patch @@ -0,0 +1,12 @@ +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 |