From 6208273727c27a6bd5111fedc48535bc2d9eb47b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 27 Dec 2018 21:23:41 +0100
Subject: [PATCH 1/4] pacman: use runtimeShell as the scriptlet shell

---
 pkgs/tools/package-management/pacman/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index 81e8152769b7..b81c833063d6 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, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "pacman";
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     "--disable-doc"
 
     "--localstatedir=/var"
+    "--with-scriptlet-shell=${runtimeShell}"
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 2858e9838d048f1d5f1bd6c9943df3db13ad4ab6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 27 Dec 2018 21:24:22 +0100
Subject: [PATCH 2/4] pacman: build with libcurl

Obviates the need to specify a custom Xfer command
---
 pkgs/tools/package-management/pacman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index b81c833063d6..f6c43b9ff159 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, runtimeShell }:
+zlib, bzip2, lzma, curl, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "pacman";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ perl libarchive openssl zlib bzip2 lzma ];
+  buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ];
 
   postFixup = ''
     substituteInPlace $out/bin/repo-add \

From 42128d962ffafe71f0c4567e39f0fe657bec9da3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 May 2019 12:30:23 +0200
Subject: [PATCH 3/4] pacman: parallel building

---
 pkgs/tools/package-management/pacman/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index f6c43b9ff159..60fd7caa5a50 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76";
   };
 
+  enableParallelBuilding = true;
+
   configureFlags = [
     # trying to build docs fails with a2x errors, unable to fix through asciidoc
     "--disable-doc"

From 96d81151e67cc9d9e8ff56c0d4b8cf8d5a2d9c0f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 May 2019 12:39:07 +0200
Subject: [PATCH 4/4] pacman: set sysconfdir=/etc

---
 pkgs/tools/package-management/pacman/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index 60fd7caa5a50..9fd0ea05510d 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -16,10 +16,13 @@ stdenv.mkDerivation rec {
     # 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 = [ curl perl libarchive openssl zlib bzip2 lzma ];