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.
This commit is contained in:
committed by
Jonathan Ringer
parent
200bb8c977
commit
9bb3fccb5b
@@ -500,7 +500,7 @@ self: super: builtins.intersectAttrs super {
|
||||
# requires autotools to build
|
||||
secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ];
|
||||
|
||||
# requires libsecp256k1 in pkgconfig-depends
|
||||
# requires libsecp256k1 in pkg-config-depends
|
||||
secp256k1-haskell = addPkgconfigDepend super.secp256k1-haskell pkgs.secp256k1;
|
||||
|
||||
# tests require git and zsh
|
||||
|
||||
@@ -7,7 +7,7 @@ let
|
||||
isCross = stdenv.buildPlatform != stdenv.hostPlatform;
|
||||
inherit (buildPackages)
|
||||
fetchurl removeReferencesTo
|
||||
pkgconfig coreutils gnugrep gnused glibcLocales;
|
||||
pkg-config coreutils gnugrep gnused glibcLocales;
|
||||
in
|
||||
|
||||
{ pname
|
||||
@@ -54,7 +54,7 @@ in
|
||||
, doCoverage ? false
|
||||
, doHaddock ? !(ghc.isHaLVM or false)
|
||||
, passthru ? {}
|
||||
, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
|
||||
, pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
|
||||
, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? []
|
||||
, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? []
|
||||
, testTarget ? ""
|
||||
@@ -234,7 +234,7 @@ let
|
||||
|
||||
isHaskellPkg = x: x ? isHaskellLibrary;
|
||||
|
||||
allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
|
||||
allPkgconfigDepends = pkg-configDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
|
||||
optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
|
||||
|
||||
depsBuildBuild = [ nativeGhc ];
|
||||
@@ -243,7 +243,7 @@ let
|
||||
optionals doCheck testToolDepends ++
|
||||
optionals doBenchmark benchmarkToolDepends;
|
||||
nativeBuildInputs =
|
||||
[ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
|
||||
[ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkg-config ++
|
||||
setupHaskellDepends ++ collectedToolDepends;
|
||||
propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
|
||||
otherBuildInputsHaskell =
|
||||
@@ -285,7 +285,7 @@ let
|
||||
'';
|
||||
in stdenv.lib.fix (drv:
|
||||
|
||||
assert allPkgconfigDepends != [] -> pkgconfig != null;
|
||||
assert allPkgconfigDepends != [] -> pkg-config != null;
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
name = "${pname}-${version}";
|
||||
@@ -532,7 +532,7 @@ stdenv.mkDerivation ({
|
||||
libraryPkgconfigDepends
|
||||
librarySystemDepends
|
||||
libraryToolDepends
|
||||
pkgconfigDepends
|
||||
pkg-configDepends
|
||||
setupHaskellDepends
|
||||
;
|
||||
} // stdenv.lib.optionalAttrs doCheck {
|
||||
@@ -616,7 +616,7 @@ stdenv.mkDerivation ({
|
||||
|
||||
depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild;
|
||||
nativeBuildInputs =
|
||||
[ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
|
||||
[ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++
|
||||
collectedToolDepends;
|
||||
buildInputs =
|
||||
otherBuildInputsSystem;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, ghc, pkgconfig, glibcLocales
|
||||
{ stdenv, ghc, pkg-config, glibcLocales
|
||||
, cacert, stack, makeSetupHook, lib }@depArgs:
|
||||
|
||||
{ buildInputs ? []
|
||||
@@ -28,7 +28,7 @@ in stdenv.mkDerivation (args // {
|
||||
++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales;
|
||||
|
||||
nativeBuildInputs = nativeBuildInputs
|
||||
++ [ ghc pkgconfig stack stackHook ];
|
||||
++ [ ghc pkg-config stack stackHook ];
|
||||
|
||||
STACK_PLATFORM_VARIANT = "nix";
|
||||
STACK_IN_NIX_SHELL = 1;
|
||||
|
||||
@@ -160,7 +160,7 @@ rec {
|
||||
addTestToolDepends = drv: xs: overrideCabal drv (drv: { testToolDepends = (drv.testToolDepends or []) ++ xs; });
|
||||
|
||||
addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x];
|
||||
addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; });
|
||||
addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkg-configDepends = (drv.pkg-configDepends or []) ++ xs; });
|
||||
|
||||
addSetupDepend = drv: x: addSetupDepends drv [x];
|
||||
addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; });
|
||||
|
||||
Reference in New Issue
Block a user