From 15aeffa7ca3a0a9f8a029c6809861eebbc406503 Mon Sep 17 00:00:00 2001 From: Vincent Tavernier Date: Fri, 15 Mar 2019 12:32:39 +0100 Subject: [PATCH] nix: fix sandbox-shell path This fixes #9805 which prevents newly-installed nix from working as no sandbox shell has been set during the configure step. closes #9863 closes #9805 --- srcpkgs/nix/template | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 9cf92913da6..0a9142f9289 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,15 +1,23 @@ # Template file for 'nix' pkgname=nix version=2.2.1 -revision=2 +revision=3 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. -configure_args="--localstatedir=/nix/var" +configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" hostmakedepends="autoconf automake curl libtool pkg-config flex" makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel liblzma-devel libressl-devel libsodium-devel pkg-config sqlite-devel libseccomp-devel editline-devel" depends="curl xz" +short_desc="Purely functional package manager" +maintainer="Juan RP " +license="LGPL-2.1-or-later" +homepage="https://nixos.org/nix/" +changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" +distfiles="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz" +checksum=85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515 + # Default configuration file. conf_files="/etc/nix/nix.conf" # Create required build users/groups. @@ -31,13 +39,6 @@ make_dirs=" /nix/var/nix/userpool 0755 root root /nix/var/nix/db 0755 root root /nix/store 1775 root nixbld" -short_desc="Purely functional package manager" -maintainer="Juan RP " -license="LGPL-2.1-or-later" -homepage="https://nixos.org/nix/" -changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" -distfiles="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz" -checksum=85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515 case "${XBPS_TARGET_MACHINE}" in armv[56]*)