From 85fc0a2c2414299fab5f9ecc1951bbbf1cfbe625 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 1 Jan 2018 23:23:37 +0100
Subject: [PATCH] nix: make /etc/profile.d/nix.sh not use word splitting

This will not work e.g. if the script is sourced by zsh.
Instead, just adjust $PATH twice.

Fixes #10336.
---
 srcpkgs/nix/files/nix.sh | 7 ++-----
 srcpkgs/nix/template     | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/nix/files/nix.sh b/srcpkgs/nix/files/nix.sh
index 6c0e58673fb..b66da0bdd2e 100644
--- a/srcpkgs/nix/files/nix.sh
+++ b/srcpkgs/nix/files/nix.sh
@@ -15,11 +15,8 @@ if ! test -L $HOME/.nix-profile; then
 	fi
 fi
 
-export NIX_PROFILES="/nix/var/nix/profiles/default $HOME/.nix-profile"
-
-for i in $NIX_PROFILES; do
-	export PATH=$i/bin:$PATH
-done
+export PATH=/nix/var/nix/profiles/default/bin:$PATH
+export PATH=$HOME/.nix-profile/bin:$PATH
 
 if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
 	echo "http://nixos.org/channels/nixpkgs-unstable nixpkgs" \
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index d08173ac23b..fcca8228016 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,7 +1,7 @@
 # Template file for 'nix'
 pkgname=nix
 version=1.11.16
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var"