diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-18 22:50:56 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-19 01:16:25 -0800 |
commit | 9bb3fccb5b55326cb3c2c507464a8a28d44d1730 (patch) | |
tree | 9d1c0c16cce5e5dcc08115230f6412865487964b /pkgs/os-specific/linux/zfs | |
parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) | |
download | nixpkgs-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/os-specific/linux/zfs')
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 85990a6989d..61313f08f31 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , nfs-utils , gawk, gnugrep, gnused, systemd , smartmontools, sysstat, sudo -, pkgconfig +, pkg-config # Kernel dependencies , kernel ? null @@ -91,7 +91,7 @@ let nativeBuildInputs = [ autoreconfHook269 nukeReferences ] ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) - ++ optional buildUser pkgconfig; + ++ optional buildUser pkg-config; buildInputs = optionals buildUser [ zlib libuuid attr libtirpc ] ++ optional buildUser openssl ++ optional (buildUser && enablePython) python3; |