pyrox.dev
Merge pull request #171270 from SuperSandro2000/pkgconfig
+1
-6
pkgs/development/python-modules/pkgconfig/default.nix
+1
-6
pkgs/development/python-modules/pkgconfig/default.nix
···
26
26
sha256 = "sha256-uuLUGRNLCR3NS9g6OPCI+qG7tPWsLhI3OE5WmSI3vm8=";
27
27
};
28
28
29
-
patches = [ ./executable.patch ];
30
-
31
29
postPatch = ''
32
-
rm pkgconfig/pkgconfig.py.orig
33
30
substituteInPlace pkgconfig/pkgconfig.py \
34
-
--replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"'
31
+
--replace "pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config'" "pkg_config_exe = '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'"
35
32
36
33
# those pc files are missing and pkg-config validates that they exist
37
34
substituteInPlace data/fake-openssl.pc \
···
39
36
'';
40
37
41
38
nativeBuildInputs = [ poetry-core ];
42
-
43
-
propagatedNativeBuildInputs = [ pkg-config ];
44
39
45
40
checkInputs = [ pytestCheckHook ];
46
41
-38
pkgs/development/python-modules/pkgconfig/executable.patch
-38
pkgs/development/python-modules/pkgconfig/executable.patch
···
1
-
commit d8e0bac0c0d831510683939ec7a7b5bd72192423
2
-
Author: Frederik Rietdijk <fridh@fridh.nl>
3
-
Date: Sat Jan 5 11:38:28 2019 +0100
4
-
5
-
Have a top-level attribute for the executable
6
-
7
-
diff --git a/pkgconfig/pkgconfig.py b/pkgconfig/pkgconfig.py
8
-
index 3deb97f..e7c5561 100644
9
-
--- a/pkgconfig/pkgconfig.py
10
-
+++ b/pkgconfig/pkgconfig.py
11
-
@@ -30,6 +30,9 @@ from functools import wraps
12
-
from subprocess import call, PIPE, Popen
13
-
14
-
15
-
+PKG_CONFIG_EXE = "pkg-config"
16
-
+
17
-
+
18
-
def _compare_versions(v1, v2):
19
-
"""
20
-
Compare two version strings and return -1, 0 or 1 depending on the equality
21
-
@@ -65,7 +68,7 @@ def _convert_error(func):
22
-
23
-
@_convert_error
24
-
def _query(package, *options):
25
-
- pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config'
26
-
+ pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE
27
-
cmd = '{0} {1} {2}'.format(pkg_config_exe, ' '.join(options), package)
28
-
proc = Popen(shlex.split(cmd), stdout=PIPE, stderr=PIPE)
29
-
out, err = proc.communicate()
30
-
@@ -84,7 +87,7 @@ def exists(package):
31
-
32
-
If ``pkg-config`` not on path, raises ``EnvironmentError``.
33
-
"""
34
-
- pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config'
35
-
+ pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE
36
-
cmd = '{0} --exists {1}'.format(pkg_config_exe, package).split()
37
-
return call(cmd) == 0
38
-