diff --git a/srcpkgs/nix/files/nix-daemon.service b/srcpkgs/nix/files/nix-daemon.service deleted file mode 100644 index ee28209f090..00000000000 --- a/srcpkgs/nix/files/nix-daemon.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Helper daemon for managing secure, multi-user Nix stores -After=syslog.target - -[Service] -Type=simple -ExecStart=/usr/bin/nix-daemon - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index ba9fcec5bed..a73d78973a6 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,6 +1,6 @@ # Template file for 'nix' pkgname=nix -version=1.6.1 +version=1.7 revision=1 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. @@ -37,16 +37,15 @@ maintainer="Juan RP " license="MIT" homepage="http://nixos.org/nix/" distfiles="http://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz" -checksum=31d15f99b2405924a4be278334cc973a71999303631e6798c1d294db9be4bf84 +checksum=349163654f2ae3e1a17fb3da7ed164a4cac153728bbe9a26764e17556d3dcc92 post_install() { + vmkdir etc/nix # Remove unused stuff. rm -rf ${DESTDIR}/usr/include ${DESTDIR}/nix # Let users interact with the nix-daemon by default. vmkdir etc/profile.d echo 'export NIX_REMOTE=daemon' > ${DESTDIR}/etc/profile.d/nix-daemon.sh - # Install nix-daemon systemd service. - vinstall ${FILESDIR}/nix-daemon.service 644 usr/lib/systemd/system # Setup build users. echo 'build-users-group = nixbld' > ${DESTDIR}/etc/nix/nix.conf # Install our profile.d/nix for multi-user by default.