aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Pharo <asppsa@gmail.com>2019-05-06 14:36:16 +1000
committerAlastair Pharo <asppsa@gmail.com>2019-05-06 14:36:16 +1000
commit8d425371679c10323edb4f124e9ad64c9f9e9944 (patch)
treec54b4bdcd47e97ce7f7ea1113e785a4f6eece270
parent9fe456c4973729b5d83763dd0a644f830491e740 (diff)
downloadAUR-8d425371679c10323edb4f124e9ad64c9f9e9944.tar.gz
AUR-8d425371679c10323edb4f124e9ad64c9f9e9944.tar.zst
AUR-8d425371679c10323edb4f124e9ad64c9f9e9944.zip
Add editline dependency
Required for nix-repl; see https://aur.archlinux.org/packages/nix/#comment-692643
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD9
2 files changed, 5 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 562a12e..8a00b07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
1pkgbase = nix 1pkgbase = nix
2 pkgdesc = A purely functional package manager 2 pkgdesc = A purely functional package manager
3 pkgver = 2.2.2 3 pkgver = 2.2.2
4 pkgrel = 1 4 pkgrel = 2
5 url = https://nixos.org/nix 5 url = https://nixos.org/nix
6 install = nix.install 6 install = nix.install
7 arch = i686 7 arch = i686
@@ -9,13 +9,12 @@ pkgbase = nix
9 arch = armv7h 9 arch = armv7h
10 license = LGPL 10 license = LGPL
11 makedepends = bzip2 11 makedepends = bzip2
12 makedepends = gc
13 makedepends = openssl 12 makedepends = openssl
14 depends = gc 13 depends = gc
15 depends = libsodium 14 depends = libsodium
16 depends = boost 15 depends = boost
17 depends = brotli 16 depends = brotli
18 depends = readline 17 depends = editline
19 source = https://nixos.org/releases/nix/nix-2.2.2/nix-2.2.2.tar.xz 18 source = https://nixos.org/releases/nix/nix-2.2.2/nix-2.2.2.tar.xz
20 sha256sums = f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c 19 sha256sums = f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c
21 20
diff --git a/PKGBUILD b/PKGBUILD
index ac47667..7b68c7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,26 +8,23 @@
8 8
9pkgname=nix 9pkgname=nix
10pkgver=2.2.2 10pkgver=2.2.2
11pkgrel=1 11pkgrel=2
12pkgdesc="A purely functional package manager" 12pkgdesc="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')
17makedepends=('bzip2' 'gc' 'openssl') 17makedepends=('bzip2' '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")
20sha256sums=('f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c') 20sha256sums=('f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c')
21 21
22
23prepare() { 22prepare() {
24 cd "$pkgname-$pkgver" 23 cd "$pkgname-$pkgver"
25} 24}
26 25
27build () { 26build () {
28 cd "$pkgname-$pkgver" 27 cd "$pkgname-$pkgver"
29 export EDITLINE_CFLAGS="-DREADLINE"
30 export EDITLINE_LIBS="/usr/lib/libreadline.so"
31 ./configure --prefix=/usr \ 28 ./configure --prefix=/usr \
32 --libexecdir="/usr/lib/$pkgname" \ 29 --libexecdir="/usr/lib/$pkgname" \
33 --sysconfdir=/etc \ 30 --sysconfdir=/etc \