public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70451 from joachifm/feat/pacman-enhancements

Browse Source 
Pacman packaging enhancements
This commit is contained in:
Joachim F 2019-10-06 11:02:21 +00:00 committed by GitHub
commit 7f8b310eb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/package-management/pacman/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl, { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl,
zlib, bzip2, lzma }: zlib, bzip2, lzma, curl, runtimeShell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pacman"; pname = "pacman";
@ -10,15 +10,21 @@ stdenv.mkDerivation rec {
sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76"; sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76";
}; };
enableParallelBuilding = true;
configureFlags = [ configureFlags = [
# trying to build docs fails with a2x errors, unable to fix through asciidoc # trying to build docs fails with a2x errors, unable to fix through asciidoc
"--disable-doc" "--disable-doc"
"--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--with-scriptlet-shell=${runtimeShell}"
]; ];
installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ perl libarchive openssl zlib bzip2 lzma ]; buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ];
postFixup = '' postFixup = ''
substituteInPlace $out/bin/repo-add \ substituteInPlace $out/bin/repo-add \