Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/files/
Date: Fri, 06 Jul 2018 20:45:18
Message-Id: 1530909896.bacb85aabf5112d77daecf02a1028522b0fa7eb1.slyfox@gentoo
1 commit: bacb85aabf5112d77daecf02a1028522b0fa7eb1
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jul 4 16:29:11 2018 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 6 20:44:56 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacb85aa
7
8 sys-apps/nix: remove unused patch
9
10 sys-apps/nix/files/nix-1.11.6-per-user.patch | 11 -----------
11 1 file changed, 11 deletions(-)
12
13 diff --git a/sys-apps/nix/files/nix-1.11.6-per-user.patch b/sys-apps/nix/files/nix-1.11.6-per-user.patch
14 deleted file mode 100644
15 index 9cea685c59a..00000000000
16 --- a/sys-apps/nix/files/nix-1.11.6-per-user.patch
17 +++ /dev/null
18 @@ -1,11 +0,0 @@
19 -By default created symlink poins to a directory not accessible by user.
20 -Make a symlink the same way NixOS does symlinking.
21 -diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
22 -index 672d1f0..e3b0978 100644
23 ---- a/scripts/nix-profile.sh.in
24 -+++ b/scripts/nix-profile.sh.in
25 -@@ -6,3 +6,3 @@ if [ -n "$HOME" ]; then
26 - echo "creating $NIX_LINK" >&2
27 -- _NIX_DEF_LINK=@localstatedir@/nix/profiles/default
28 -+ _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile
29 - @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"