diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2019-02-03 15:35:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-03 15:35:55 +0000 |
| commit | abac6afe93a60c6078c7d86b93fbbace4da3b363 (patch) | |
| tree | eb5734f5f45de0bd652231aaa273e9c4a18ae036 | |
| parent | 25a0974c4ab320dd984a7398a1a23928a8a0e78a (diff) | |
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.
| -rw-r--r-- | pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch (renamed from pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/pkg-config/default.nix (renamed from pkgs/development/tools/misc/pkgconfig/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/pkg-config/requires-private.patch (renamed from pkgs/development/tools/misc/pkgconfig/requires-private.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/pkg-config/setup-hook.sh (renamed from pkgs/development/tools/misc/pkgconfig/setup-hook.sh) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
5 files changed, 4 insertions, 2 deletions
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 index c1dd808e60080..c1dd808e60080 100644 --- 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 diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 81fb7f8b13ffe..81fb7f8b13ffe 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/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 index d40aa98013798..d40aa98013798 100644 --- a/pkgs/development/tools/misc/pkgconfig/requires-private.patch +++ b/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 index 34a9b9f1173b8..34a9b9f1173b8 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/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 49c6e774d3e79..1dc927f42b0d6 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 {}; |