pythonPackages.pkgconfig: change pkg-config to propagatedNativeBuildInput
Dependent packages require pkg-config. Remove test-related overrides. Next version will include tests in the PyPi dist so there isn't much benefit to building from source just for that.
This commit is contained in:
parent
4a75203f02
commit
3f7e683741
|
@ -1,10 +1,10 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, nose, pkgconfig }:
|
||||
{ lib, buildPythonPackage, fetchPypi, pkg-config }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pkgconfig";
|
||||
version = "1.5.1";
|
||||
|
||||
inherit (pkgconfig)
|
||||
inherit (pkg-config)
|
||||
setupHooks
|
||||
wrapperName
|
||||
suffixSalt
|
||||
|
@ -17,19 +17,18 @@ buildPythonPackage rec {
|
|||
sha256 = "97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
propagatedNativeBuildInputs = [ pkg-config ];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests
|
||||
'';
|
||||
doCheck = false;
|
||||
|
||||
patches = [ ./executable.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"'
|
||||
substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pkgconfig" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interface Python with pkg-config";
|
||||
homepage = "https://github.com/matze/pkgconfig";
|
||||
|
|
|
@ -4667,7 +4667,7 @@ in {
|
|||
inherit (pkgs.libsForQt5) soqt;
|
||||
};
|
||||
|
||||
pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; };
|
||||
pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; };
|
||||
|
||||
pkginfo = callPackage ../development/python-modules/pkginfo { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue