diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2018-02-22 22:12:06 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-02-22 22:53:10 +0000 |
| commit | a4eac509af375f8c67e219415b3281c3a457678f (patch) | |
| tree | d58bd70d6914bf9ac6b50b232100ca6cb63f17fc /sys-apps/nix/files | |
| parent | www-misc/zoneminder: Remove old (diff) | |
| download | gentoo-a4eac509af375f8c67e219415b3281c3a457678f.tar.gz gentoo-a4eac509af375f8c67e219415b3281c3a457678f.tar.bz2 gentoo-a4eac509af375f8c67e219415b3281c3a457678f.zip | |
sys-apps/nix: bump up to 2.0
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'sys-apps/nix/files')
| -rw-r--r-- | sys-apps/nix/files/nix-1.11.6-systemd.patch | 2 | ||||
| -rw-r--r-- | sys-apps/nix/files/nix-2.0-user-path.patch | 10 |
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 + |