From 1ada6857e668653b6bfcc59988a922e0fc0fc6a4 Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Mon, 19 Nov 2018 13:31:56 +0100
Subject: [PATCH 1/4] Add pkgconf

---
 .../tools/misc/pkgconf/default.nix            | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/misc/pkgconf/default.nix

diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix
new file mode 100644
index 00000000000..629f0168588
--- /dev/null
+++ b/pkgs/development/tools/misc/pkgconf/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, automake, autoconf, libtool }:
+
+# with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "pkgconf-1.5.4";
+
+  src = fetchgit {
+    url = "https://git.dereferenced.org/pkgconf/pkgconf.git";
+    rev = "74133eda31bc1ed5947b4a3a854001e320b6c1fe";
+    sha256 = "159fxbwm5shz8p95jp28wrjvinlhmp42dy60pqg34psjn41wq1q4";
+  };
+
+  buildInputs = [ automake autoconf libtool ];
+
+  preConfigurePhases = ["autogenPhase"];
+
+  autogenPhase = ''
+    ./autogen.sh
+  '';
+
+  #meta = {
+  #  description = "TODO";
+  #  homepage = "TODO";
+  #  platforms = "TODO";
+  #  license = "TODO";
+  #};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4095658a38e..fa03b96069f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8801,9 +8801,12 @@ with pkgs;
 
   pmccabe = callPackage ../development/tools/misc/pmccabe { };
 
+  pkgconf = callPackage ../development/tools/misc/pkgconf {};
+
   pkgconfig = callPackage ../development/tools/misc/pkgconfig {
     fetchurl = fetchurlBoot;
   };
+
   pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
 
   postiats-utilities = callPackage ../development/tools/postiats-utilities {};

From 5c1d144074fa45edf7ae770945b1ee131abda405 Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Mon, 19 Nov 2018 13:54:25 +0100
Subject: [PATCH 2/4] Add meta

---
 pkgs/development/tools/misc/pkgconf/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix
index 629f0168588..fb7fb7e10c6 100644
--- a/pkgs/development/tools/misc/pkgconf/default.nix
+++ b/pkgs/development/tools/misc/pkgconf/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, automake, autoconf, libtool }:
 
-# with stdenv.lib;
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "pkgconf-1.5.4";
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  #meta = {
-  #  description = "TODO";
-  #  homepage = "TODO";
-  #  platforms = "TODO";
-  #  license = "TODO";
-  #};
+  meta = {
+    description = "Package compiler and linker metadata toolkit";
+    homepage = https://git.dereferenced.org/pkgconf/pkgconf;
+    platforms = platforms.all;
+    license = licenses.isc;
+  };
 }

From 580efed35522b3dc322c81088d4f0f3d2384359c Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Mon, 19 Nov 2018 13:56:51 +0100
Subject: [PATCH 3/4] Add maintainer

---
 maintainers/maintainer-list.nix                 | 5 +++++
 pkgs/development/tools/misc/pkgconf/default.nix | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 264f74c109e..ea4cd3fdf83 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4853,6 +4853,11 @@
     github = "umazalakain";
     name = "Unai Zalakain";
   };
+  zaninime = {
+    email = "francesco@zanini.me";
+    github = "zaninime";
+    name = "Francesco Zanini";
+  };
   zarelit = {
     email = "david@zarel.net";
     github = "zarelit";
diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix
index fb7fb7e10c6..34e08ba9ebe 100644
--- a/pkgs/development/tools/misc/pkgconf/default.nix
+++ b/pkgs/development/tools/misc/pkgconf/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchgit, automake, autoconf, libtool }:
 
-with stdenv.lib;
-
 stdenv.mkDerivation rec {
   name = "pkgconf-1.5.4";
 
@@ -19,10 +17,11 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Package compiler and linker metadata toolkit";
     homepage = https://git.dereferenced.org/pkgconf/pkgconf;
     platforms = platforms.all;
     license = licenses.isc;
+    maintainers = with maintainers; [ zaninime ];
   };
 }

From 5efb4643e2ea36bf9b49a1848a436428cd568dc2 Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Tue, 20 Nov 2018 09:52:13 +0100
Subject: [PATCH 4/4] Use distfiles

---
 pkgs/development/tools/misc/pkgconf/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix
index 34e08ba9ebe..120b824a773 100644
--- a/pkgs/development/tools/misc/pkgconf/default.nix
+++ b/pkgs/development/tools/misc/pkgconf/default.nix
@@ -1,22 +1,13 @@
-{ stdenv, fetchgit, automake, autoconf, libtool }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "pkgconf-1.5.4";
 
-  src = fetchgit {
-    url = "https://git.dereferenced.org/pkgconf/pkgconf.git";
-    rev = "74133eda31bc1ed5947b4a3a854001e320b6c1fe";
-    sha256 = "159fxbwm5shz8p95jp28wrjvinlhmp42dy60pqg34psjn41wq1q4";
+  src = fetchurl {
+    url = "https://distfiles.dereferenced.org/pkgconf/${name}.tar.xz";
+    sha256 = "0r26qmij9lxpz183na3dxj6lamcma94cjhasy19fya44w2j68n4w";
   };
 
-  buildInputs = [ automake autoconf libtool ];
-
-  preConfigurePhases = ["autogenPhase"];
-
-  autogenPhase = ''
-    ./autogen.sh
-  '';
-
   meta = with stdenv.lib; {
     description = "Package compiler and linker metadata toolkit";
     homepage = https://git.dereferenced.org/pkgconf/pkgconf;