Merge pull request #47268 from Ma27/fix-py3exiv2

python3Packages.py3exiv2: fix build
This commit is contained in:
Jörg Thalheim 2018-09-24 13:52:43 +01:00 committed by GitHub
commit db05dd8b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }: { buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "py3exiv2"; pname = "py3exiv2";
@ -16,7 +16,12 @@ buildPythonPackage rec {
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
# fix broken libboost_python3 detection # fix broken libboost_python3 detection
patches = [ ./setup.patch ]; patches = [
(substituteAll {
src = ./setup.patch;
version = "3${stdenv.lib.versions.minor python.version}";
})
];
meta = { meta = {
homepage = "https://launchpad.net/py3exiv2"; homepage = "https://launchpad.net/py3exiv2";

View File

@ -5,7 +5,7 @@
return l.replace('libboost', 'boost') return l.replace('libboost', 'boost')
-libboost = get_libboost_name() -libboost = get_libboost_name()
+libboost = 'boost_python3' +libboost = 'boost_python@version@'
setup( setup(
name='py3exiv2', name='py3exiv2',