diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
| commit | a0c34f54cc61dc20ae1ec91766b9efad102f5b36 (patch) | |
| tree | 96aeb2b4fb3aeff9ecc8c52d173c3b8d57a0ce59 /pkgs/tools/package-management | |
| parent | 0913e30c859f0071d0f0529c309d4256713acc41 (diff) | |
| parent | 60b2fe660e2bcb605650173b7b0a59a47bc6a7e5 (diff) | |
| download | nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.gz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.bz2 nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.lz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.xz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.zst nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/pacman/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 81e8152769b7..9fd0ea05510d 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl, -zlib, bzip2, lzma }: +zlib, bzip2, lzma, curl, runtimeShell }: stdenv.mkDerivation rec { pname = "pacman"; @@ -10,15 +10,21 @@ stdenv.mkDerivation rec { sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76"; }; + enableParallelBuilding = true; + configureFlags = [ # trying to build docs fails with a2x errors, unable to fix through asciidoc "--disable-doc" + "--sysconfdir=/etc" "--localstatedir=/var" + "--with-scriptlet-shell=${runtimeShell}" ]; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ perl libarchive openssl zlib bzip2 lzma ]; + buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ]; postFixup = '' substituteInPlace $out/bin/repo-add \ |