aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-02-14 14:24:20 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-02-14 14:24:20 +0100
commit891d6aee0f5eeb733173384a2a3e84203fb12654 (patch)
treedb4341bc663c3810a0a0c838a84dde819a0e0228
parented04b08b9b4e7c4b8c882450536895592341edcc (diff)
downloadAUR-891d6aee0f5eeb733173384a2a3e84203fb12654.tar.gz
AUR-891d6aee0f5eeb733173384a2a3e84203fb12654.tar.zst
AUR-891d6aee0f5eeb733173384a2a3e84203fb12654.zip
upgpkg: nix 2.2.1-1
Update package to make use of dash-static and editline
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 45cfdc5..1e3af62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,8 @@ pkgbase = nix
15 depends = libsodium 15 depends = libsodium
16 depends = boost 16 depends = boost
17 depends = brotli 17 depends = brotli
18 depends = readline 18 depends = editline
19 depends = dash-static
19 source = https://nixos.org/releases/nix/nix-2.2.1/nix-2.2.1.tar.xz 20 source = https://nixos.org/releases/nix/nix-2.2.1/nix-2.2.1.tar.xz
20 sha256sums = 85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515 21 sha256sums = 85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515
21 22
diff --git a/PKGBUILD b/PKGBUILD
index daa8e74..a3c9a86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc="A purely functional package manager"
13arch=('i686' 'x86_64' 'armv7h') 13arch=('i686' 'x86_64' 'armv7h')
14url="https://nixos.org/nix" 14url="https://nixos.org/nix"
15license=('LGPL') 15license=('LGPL')
16depends=('gc' 'libsodium' 'boost' 'brotli' 'readline') 16depends=('gc' 'libsodium' 'boost' 'brotli' 'editline' 'dash-static')
17makedepends=('bzip2' 'gc' 'openssl') 17makedepends=('bzip2' 'gc' 'openssl')
18install=nix.install 18install=nix.install
19source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") 19source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz")
@@ -26,11 +26,10 @@ prepare() {
26 26
27build () { 27build () {
28 cd "$pkgname-$pkgver" 28 cd "$pkgname-$pkgver"
29 export EDITLINE_CFLAGS="-DREADLINE"
30 export EDITLINE_LIBS="/usr/lib/libreadline.so"
31 ./configure --prefix=/usr \ 29 ./configure --prefix=/usr \
32 --libexecdir="/usr/lib/$pkgname" \ 30 --libexecdir="/usr/lib/$pkgname" \
33 --sysconfdir=/etc \ 31 --sysconfdir=/etc \
32 --with-sandbox-shell=/usr/bin/dash-static \
34 --enable-gc 33 --enable-gc
35 make 34 make
36} 35}