summaryrefslogtreecommitdiff
path: root/sys-apps/nix/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-02-24 19:58:07 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-02-24 19:58:07 +0000
commit99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
treeda76713365257a445f3ae3b95470917f59d46728 /sys-apps/nix/files
parent4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)
gentoo resync : 24.02.2018
Diffstat (limited to 'sys-apps/nix/files')
-rw-r--r--sys-apps/nix/files/nix-1.11.6-systemd.patch2
-rw-r--r--sys-apps/nix/files/nix-2.0-user-path.patch10
2 files changed, 11 insertions, 1 deletions
diff --git a/sys-apps/nix/files/nix-1.11.6-systemd.patch b/sys-apps/nix/files/nix-1.11.6-systemd.patch
index f890ee6f0470..5a77d7c77e5c 100644
--- a/sys-apps/nix/files/nix-1.11.6-systemd.patch
+++ b/sys-apps/nix/files/nix-1.11.6-systemd.patch
@@ -1,4 +1,4 @@
-Make 'nix-daemon' a goof unit for 'systemctl enable nix-daemon.service'.
+Make 'nix-daemon' a good unit for 'systemctl enable nix-daemon.service'.
diff --git a/misc/systemd/nix-daemon.service.in b/misc/systemd/nix-daemon.service.in
index 5fc04a3..2565520 100644
--- a/misc/systemd/nix-daemon.service.in
diff --git a/sys-apps/nix/files/nix-2.0-user-path.patch b/sys-apps/nix/files/nix-2.0-user-path.patch
new file mode 100644
index 000000000000..486a05bb5959
--- /dev/null
+++ b/sys-apps/nix/files/nix-2.0-user-path.patch
@@ -0,0 +1,10 @@
+On gentoo 'id' is /usr/bin/id while @coreutils@ is /bin.
+diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
+index a5f5227..1dc5379 100644
+--- a/scripts/nix-profile.sh.in
++++ b/scripts/nix-profile.sh.in
+@@ -2,3 +2,3 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
+ __savedpath="$PATH"
+- export PATH=@coreutils@
++ export PATH=@coreutils@:@prefix@/bin:@prefix@/../bin
+