diff options
Diffstat (limited to 'nix')
-rw-r--r-- | nix/.SRCINFO | 3 | ||||
-rw-r--r-- | nix/PKGBUILD | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nix/.SRCINFO b/nix/.SRCINFO index 45cfdc5..1e3af62 100644 --- a/nix/.SRCINFO +++ b/nix/.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/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" | |||
13 | arch=('i686' 'x86_64' 'armv7h') | 13 | arch=('i686' 'x86_64' 'armv7h') |
14 | url="https://nixos.org/nix" | 14 | url="https://nixos.org/nix" |
15 | license=('LGPL') | 15 | license=('LGPL') |
16 | depends=('gc' 'libsodium' 'boost' 'brotli' 'readline') | 16 | depends=('gc' 'libsodium' 'boost' 'brotli' 'editline' 'dash-static') |
17 | makedepends=('bzip2' 'gc' 'openssl') | 17 | makedepends=('bzip2' 'gc' 'openssl') |
18 | install=nix.install | 18 | install=nix.install |
19 | source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") | 19 | source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") |
@@ -26,11 +26,10 @@ prepare() { | |||
26 | 26 | ||
27 | build () { | 27 | build () { |
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 | } |