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 45cfdc5f1fc44e79dd43cff4c81e5fc5be523bd7..1e3af62777ea723ca0a2385f53555434586611eb 100644 (file)
--- 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 daa8e745bd692c9efb0ee02f339b88021ef5761c..a3c9a86a54acfec5de3a47acc6bae67afed60102 100644 (file)
--- 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
 }