diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-05 11:43:12 +0100 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-15 10:16:11 +0100 |
commit | 05232abbbc6574b31a714bc34d9639676b83c1a8 (patch) | |
tree | d4e8d4eb2d3f79178d8954deb149576774c8a589 /pkgs/development/python-modules/pkgconfig/executable.patch | |
parent | c5d99308def0ec6abc12aa90685d984a72437f0c (diff) | |
download | nixpkgs-05232abbbc6574b31a714bc34d9639676b83c1a8.tar nixpkgs-05232abbbc6574b31a714bc34d9639676b83c1a8.tar.gz nixpkgs-05232abbbc6574b31a714bc34d9639676b83c1a8.tar.bz2 nixpkgs-05232abbbc6574b31a714bc34d9639676b83c1a8.tar.lz nixpkgs-05232abbbc6574b31a714bc34d9639676b83c1a8.tar.xz nixpkgs-05232abbbc6574b31a714bc34d9639676b83c1a8.tar.zst nixpkgs-05232abbbc6574b31a714bc34d9639676b83c1a8.zip |
python.pkgs.pkgconfig: hardcode path to pkg-config
Diffstat (limited to 'pkgs/development/python-modules/pkgconfig/executable.patch')
-rw-r--r-- | pkgs/development/python-modules/pkgconfig/executable.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/pkgconfig/executable.patch b/pkgs/development/python-modules/pkgconfig/executable.patch new file mode 100644 index 00000000000..79fca7a44f1 --- /dev/null +++ b/pkgs/development/python-modules/pkgconfig/executable.patch @@ -0,0 +1,38 @@ +commit d8e0bac0c0d831510683939ec7a7b5bd72192423 +Author: Frederik Rietdijk <fridh@fridh.nl> +Date: Sat Jan 5 11:38:28 2019 +0100 + + Have a top-level attribute for the executable + +diff --git a/pkgconfig/pkgconfig.py b/pkgconfig/pkgconfig.py +index 3deb97f..e7c5561 100644 +--- a/pkgconfig/pkgconfig.py ++++ b/pkgconfig/pkgconfig.py +@@ -30,6 +30,9 @@ from functools import wraps + from subprocess import call, PIPE, Popen + + ++PKG_CONFIG_EXE = "pkg-config" ++ ++ + def _compare_versions(v1, v2): + """ + Compare two version strings and return -1, 0 or 1 depending on the equality +@@ -65,7 +68,7 @@ def _convert_error(func): + + @_convert_error + def _query(package, *options): +- pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config' ++ pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE + cmd = '{0} {1} {2}'.format(pkg_config_exe, ' '.join(options), package) + proc = Popen(shlex.split(cmd), stdout=PIPE, stderr=PIPE) + out, err = proc.communicate() +@@ -84,7 +87,7 @@ def exists(package): + + If ``pkg-config`` not on path, raises ``EnvironmentError``. + """ +- pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config' ++ pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE + cmd = '{0} --exists {1}'.format(pkg_config_exe, package).split() + return call(cmd) == 0 + |