From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 5 May 2019 12:20:38 +0000 (+0200)
Subject: upgpkg: nix 2.2.2-1
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FAUR.git;a=commitdiff_plain;h=728f5350afb9ea992bfd0344a2044259285bde3f;hp=9fe456c4973729b5d83763dd0a644f830491e740

upgpkg: nix 2.2.2-1

upstream release

Merge subtree 'nix'
---

diff --git a/.SRCINFO b/.SRCINFO
index 562a12e..d0f6f15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,8 @@ pkgbase = nix
 	depends = libsodium
 	depends = boost
 	depends = brotli
-	depends = readline
+	depends = editline
+	depends = dash-static
 	source = https://nixos.org/releases/nix/nix-2.2.2/nix-2.2.2.tar.xz
 	sha256sums = f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c
 
diff --git a/PKGBUILD b/PKGBUILD
index ac47667..faea9db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc="A purely functional package manager"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://nixos.org/nix"
 license=('LGPL')
-depends=('gc' 'libsodium' 'boost' 'brotli' 'readline')
+depends=('gc' 'libsodium' 'boost' 'brotli' 'editline' 'dash-static')
 makedepends=('bzip2' 'gc' 'openssl')
 install=nix.install
 source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz")
@@ -26,11 +26,10 @@ prepare() {
 
 build () {
   cd "$pkgname-$pkgver"
-  export EDITLINE_CFLAGS="-DREADLINE"
-  export EDITLINE_LIBS="/usr/lib/libreadline.so"
   ./configure --prefix=/usr \
               --libexecdir="/usr/lib/$pkgname" \
               --sysconfdir=/etc \
+              --with-sandbox-shell=/usr/bin/dash-static \
               --enable-gc
   make
 }