Urgggh

http://hydra.nixos.org/build/3661100

configure.ac

@@ -354,7 +354,6 @@ fi
 AC_SUBST(tarFlags)
 
 
-
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([Makefile
    src/Makefile

release.nix

@@ -94,6 +94,8 @@ let
 
         enableParallelBuilding = true;
 
+        makeFlags = "profiledir=$(out)/etc/profile.d";
+
         installFlags = "sysconfdir=$(out)/etc";
 
         doInstallCheck = true;

scripts/Makefile.am

@@ -7,9 +7,11 @@ noinst_SCRIPTS = nix-profile.sh \
   find-runtime-roots.pl build-remote.pl nix-reduce-build \
   copy-from-other-stores.pl nix-http-export.cgi
 
+profiledir = $(sysconfdir)/profile.d
+
 install-exec-local: download-using-manifests.pl copy-from-other-stores.pl download-from-binary-cache.pl find-runtime-roots.pl
-	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/profile.d
-	$(INSTALL_DATA) nix-profile.sh $(DESTDIR)$(sysconfdir)/profile.d/nix.sh
+	$(INSTALL) -d $(DESTDIR)$(profiledir)
+	$(INSTALL_DATA) nix-profile.sh $(DESTDIR)$(profiledir)/nix.sh
 	$(INSTALL) -d $(DESTDIR)$(libexecdir)/nix
 	$(INSTALL_PROGRAM) find-runtime-roots.pl $(DESTDIR)$(libexecdir)/nix 
 	$(INSTALL_PROGRAM) build-remote.pl $(DESTDIR)$(libexecdir)/nix 

substitute.mk

@@ -7,6 +7,7 @@
 	 -e "s^@bindir\@^$(bindir)^g" \
 	 -e "s^@datadir\@^$(datadir)^g" \
 	 -e "s^@sysconfdir\@^$(sysconfdir)^g" \
+	 -e "s^@profiledir\@^$(profiledir)^g" \
 	 -e "s^@localstatedir\@^$(localstatedir)^g" \
 	 -e "s^@datadir\@^$(datadir)^g" \
 	 -e "s^@libdir\@^$(libdir)^g" \

tests/Makefile.am

@@ -14,6 +14,8 @@ TESTS = init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \
 
 XFAIL_TESTS =
 
+profiledir = $(sysconfdir)/profile.d
+
 include ../substitute.mk
 
 $(TESTS): common.sh config.nix

tests/common.sh.in

@@ -1,7 +1,7 @@
 set -e
 
 datadir="@datadir@"
-sysconfdir="@sysconfdir@"
+profiledir="@profiledir@"
 
 export TEST_ROOT=$(pwd)/test-tmp
 export NIX_STORE_DIR

tests/nix-profile.sh

@@ -3,8 +3,8 @@ source common.sh
 home=$TEST_ROOT/home
 rm -rf $home
 mkdir -p $home
-HOME=$home $SHELL -e -c ". $sysconfdir/profile.d/nix.sh"
-HOME=$home $SHELL -e -c ". $sysconfdir/profile.d/nix.sh" # test idempotency
+HOME=$home $SHELL -e -c ". $profiledir/nix.sh"
+HOME=$home $SHELL -e -c ". $profiledir/nix.sh" # test idempotency
 
 [ -L $home/.nix-profile ]
 [ -e $home/.nix-channels ]