From 0468cea80bd24de4e2bffb3a3689dc9ce9eb1d99 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 24 Feb 2015 10:09:24 +0100 Subject: [PATCH] nix: install license; use vsv; cross compilation support. --- .../nix/files/{nix-daemon.run => nix-daemon/run} | 0 srcpkgs/nix/template | 13 +++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) rename srcpkgs/nix/files/{nix-daemon.run => nix-daemon/run} (100%) diff --git a/srcpkgs/nix/files/nix-daemon.run b/srcpkgs/nix/files/nix-daemon/run similarity index 100% rename from srcpkgs/nix/files/nix-daemon.run rename to srcpkgs/nix/files/nix-daemon/run diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 779245255b6..479f47a411d 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,14 +1,14 @@ # Template file for 'nix' pkgname=nix version=1.8 -revision=1 +revision=2 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var" -hostmakedepends="pkg-config flex" -# Extra run-time dependencies. depends="curl perl-WWW-Curl perl-DBD-SQLite" -makedepends="bzip2-devel libressl-devel sqlite-devel gc-devel ${depends}" +hostmakedepends="pkg-config flex ${depends}" +# Extra run-time dependencies. +makedepends="bzip2-devel libressl-devel sqlite-devel gc-devel" # Default configuration file. conf_files="/etc/nix/nix.conf" # Create required build users/groups. @@ -38,6 +38,8 @@ distfiles="http://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz" checksum=a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c post_install() { + vlicense COPYING LICENSE + vmkdir etc/nix # Remove unused stuff. rm -rf ${DESTDIR}/usr/include ${DESTDIR}/nix @@ -49,6 +51,5 @@ post_install() { # 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 + vsv nix-daemon }