diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-24 13:52:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 13:52:43 +0100 |
| commit | db05dd8b6dbfbed2b3cd7ed584471f05c63aacd8 (patch) | |
| tree | 7581f195d6adae1c3d2fa58ac068a3e062203964 /pkgs | |
| parent | 3e270ff919c7b0c2e0468a68fc5f9656ebd952eb (diff) | |
| parent | 50f23da8e6249ab1be7a49922f5b38f9131d0b84 (diff) | |
| download | nixlib-db05dd8b6dbfbed2b3cd7ed584471f05c63aacd8.tar nixlib-db05dd8b6dbfbed2b3cd7ed584471f05c63aacd8.tar.gz nixlib-db05dd8b6dbfbed2b3cd7ed584471f05c63aacd8.tar.bz2 nixlib-db05dd8b6dbfbed2b3cd7ed584471f05c63aacd8.tar.lz nixlib-db05dd8b6dbfbed2b3cd7ed584471f05c63aacd8.tar.xz nixlib-db05dd8b6dbfbed2b3cd7ed584471f05c63aacd8.tar.zst nixlib-db05dd8b6dbfbed2b3cd7ed584471f05c63aacd8.zip | |
Merge pull request #47268 from Ma27/fix-py3exiv2
python3Packages.py3exiv2: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/py3exiv2/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/python-modules/py3exiv2/setup.patch | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index d8633488102b..4c6ca0bad338 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }: +{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }: buildPythonPackage rec { pname = "py3exiv2"; @@ -16,7 +16,12 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; # fix broken libboost_python3 detection - patches = [ ./setup.patch ]; + patches = [ + (substituteAll { + src = ./setup.patch; + version = "3${stdenv.lib.versions.minor python.version}"; + }) + ]; meta = { homepage = "https://launchpad.net/py3exiv2"; diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch index bb4b11523479..8b0619c5bc5f 100644 --- a/pkgs/development/python-modules/py3exiv2/setup.patch +++ b/pkgs/development/python-modules/py3exiv2/setup.patch @@ -5,7 +5,7 @@ return l.replace('libboost', 'boost') -libboost = get_libboost_name() -+libboost = 'boost_python3' ++libboost = 'boost_python@version@' setup( name='py3exiv2', |