From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 14 Feb 2019 13:24:20 +0000 (+0100)
Subject: upgpkg: nix 2.2.1-1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=1f952b6c17261c0cf73c7f356eed2634622bac30;p=perso%2FImmae%2FConfig%2FAUR.git

upgpkg: nix 2.2.1-1

Update package to make use of dash-static and editline
---

diff --git a/nix/.SRCINFO b/nix/.SRCINFO
index 45cfdc5..1e3af62 100644
--- a/nix/.SRCINFO
+++ b/nix/.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.1/nix-2.2.1.tar.xz
 	sha256sums = 85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515
 
diff --git a/nix/PKGBUILD b/nix/PKGBUILD
index daa8e74..a3c9a86 100644
--- a/nix/PKGBUILD
+++ b/nix/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
 }