From 0a99017db60e980c1d493f6099c9a5e3c28fe237 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 2 Oct 2014 10:01:26 +0200
Subject: [PATCH] nix: added a runit service.

---
 srcpkgs/nix/files/nix-daemon.run |  2 ++
 srcpkgs/nix/template             | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/nix/files/nix-daemon.run

diff --git a/srcpkgs/nix/files/nix-daemon.run b/srcpkgs/nix/files/nix-daemon.run
new file mode 100644
index 00000000000..a622132194d
--- /dev/null
+++ b/srcpkgs/nix/files/nix-daemon.run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec nix-daemon nix-daemon
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 9ca147ed1a5..1d24a86c249 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,16 +1,16 @@
 # Template file for 'nix'
 pkgname=nix
 version=1.7
-revision=2
+revision=3
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var"
 hostmakedepends="pkg-config flex"
-makedepends="bzip2-devel libressl-devel sqlite-devel gc-devel curl perl-WWW-Curl perl-DBD-SQLite"
-# Default configuration file.
-conf_files="/etc/nix/nix.conf"
 # Extra run-time dependencies.
 depends="curl perl-WWW-Curl perl-DBD-SQLite"
+makedepends="bzip2-devel libressl-devel sqlite-devel gc-devel ${depends}"
+# Default configuration file.
+conf_files="/etc/nix/nix.conf"
 # Create required build users/groups.
 system_groups="nixbld"
 for f in $(seq 10); do
@@ -18,8 +18,6 @@ for f in $(seq 10); do
 	eval export nixbld\${f}_homedir="/var/empty"
 	eval export nixbld\${f}_groups="nixbld"
 done
-# Register systemd service by default.
-systemd_services="nix-daemon.service on"
 # Create required run-time directories.
 make_dirs="
 	/nix/var/log/nix/drvs 0755 root root
@@ -50,4 +48,7 @@ post_install() {
 	echo 'build-users-group = nixbld' > ${DESTDIR}/etc/nix/nix.conf
 	# Install our profile.d/nix for multi-user by default.
 	vinstall ${FILESDIR}/nix.sh 644 etc/profile.d
+	# runit service
+	vinstall ${FILESDIR}/nix-daemon.run 755 etc/sv/nix-daemon run
+	ln -s /run/runit/supervise.nix-daemon ${DESTDIR}/etc/sv/nix-daemon/supervise
 }