From abac6afe93a60c6078c7d86b93fbbace4da3b363 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 3 Feb 2019 15:35:55 +0000
Subject: [PATCH] pkgconfig: rename to pkg-config (#55094)

Package attrs should map to the pname. It's confusing otherwise.

pkg-config is also the name used by most distributions:

Debian, Homebrew, Guix, OpenSuse

other distributions like FreeBSD ports, Fedora and Arch Linux call it
"pkgconf"

Waiting a few releases to make a tree-wide change to make it easier to
back-port things.
---
 .../misc/{pkgconfig => pkg-config}/2.36.3-not-win32.patch   | 0
 .../tools/misc/{pkgconfig => pkg-config}/default.nix        | 0
 .../misc/{pkgconfig => pkg-config}/requires-private.patch   | 0
 .../tools/misc/{pkgconfig => pkg-config}/setup-hook.sh      | 0
 pkgs/top-level/all-packages.nix                             | 6 ++++--
 5 files changed, 4 insertions(+), 2 deletions(-)
 rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/2.36.3-not-win32.patch (100%)
 rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/default.nix (100%)
 rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/requires-private.patch (100%)
 rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/setup-hook.sh (100%)

diff --git a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch b/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch
similarity index 100%
rename from pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch
rename to pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix
similarity index 100%
rename from pkgs/development/tools/misc/pkgconfig/default.nix
rename to pkgs/development/tools/misc/pkg-config/default.nix
diff --git a/pkgs/development/tools/misc/pkgconfig/requires-private.patch b/pkgs/development/tools/misc/pkg-config/requires-private.patch
similarity index 100%
rename from pkgs/development/tools/misc/pkgconfig/requires-private.patch
rename to pkgs/development/tools/misc/pkg-config/requires-private.patch
diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkg-config/setup-hook.sh
similarity index 100%
rename from pkgs/development/tools/misc/pkgconfig/setup-hook.sh
rename to pkgs/development/tools/misc/pkg-config/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49c6e774d3e7..1dc927f42b0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8945,11 +8945,13 @@ in
 
   pkgconf = callPackage ../development/tools/misc/pkgconf {};
 
-  pkgconfig = callPackage ../development/tools/misc/pkgconfig {
+  pkg-config = callPackage ../development/tools/misc/pkg-config {
     fetchurl = fetchurlBoot;
   };
+  pkgconfig = pkg-config; # added 2018-02-02
 
-  pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
+  pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; });
+  pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02
 
   postiats-utilities = callPackage ../development/tools/postiats-utilities {};