public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.pkgconfig: change pkg-config to propagatedNativeBuildInput

Browse Source 
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:
Luke Adams 2021-01-01 00:27:58 +00:00
parent 4a75203f02
commit 3f7e683741
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/python-modules/pkgconfig/default.nix
View File

@ -1,10 +1,10 @@
{ lib, buildPythonPackage, fetchPypi, nose, pkgconfig }: { lib, buildPythonPackage, fetchPypi, pkg-config }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pkgconfig"; pname = "pkgconfig";
version = "1.5.1"; version = "1.5.1";
inherit (pkgconfig) inherit (pkg-config)
setupHooks setupHooks
wrapperName wrapperName
suffixSalt suffixSalt
@ -17,19 +17,18 @@ buildPythonPackage rec {
sha256 = "97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f"; sha256 = "97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f";
}; };
checkInputs = [ nose ];
nativeBuildInputs = [ pkgconfig ]; propagatedNativeBuildInputs = [ pkg-config ];
checkPhase = '' doCheck = false;
nosetests
'';
patches = [ ./executable.patch ]; patches = [ ./executable.patch ];
postPatch = '' 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; { meta = with lib; {
description = "Interface Python with pkg-config"; description = "Interface Python with pkg-config";
homepage = "https://github.com/matze/pkgconfig"; homepage = "https://github.com/matze/pkgconfig";

2
pkgs/top-level/python-packages.nix
View File

@ -4667,7 +4667,7 @@ in {
inherit (pkgs.libsForQt5) soqt; 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 { }; pkginfo = callPackage ../development/python-modules/pkginfo { };