summary refs log tree commit diff
path: root/pkgs/development/libraries/libarchive
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-01-18 22:50:56 -0800
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-01-19 01:16:25 -0800
commit9bb3fccb5b55326cb3c2c507464a8a28d44d1730 (patch)
tree9d1c0c16cce5e5dcc08115230f6412865487964b /pkgs/development/libraries/libarchive
parent200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff)
downloadnixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.gz
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.bz2
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.lz
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.xz
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.zst
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.zip
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
Diffstat (limited to 'pkgs/development/libraries/libarchive')
-rw-r--r--pkgs/development/libraries/libarchive/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 787745a6bda..6bc2ddb7d13 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,5 +1,5 @@
 {
-  fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
+  fetchFromGitHub, stdenv, pkg-config, autoreconfHook,
   acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd,
 
   # Optional but increases closure only negligibly. Also, while libxml2
@@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs =
     stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils
     ++ [ zlib bzip2 openssl xz lzo zstd ]
     ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
     ++ stdenv.lib.optional xarSupport libxml2;
 
-  # Without this, pkgconfig-based dependencies are unhappy
+  # Without this, pkg-config-based dependencies are unhappy
   propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ];
 
   configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2";