diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-09-24 14:32:50 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2018-09-24 14:32:50 +0200 |
| commit | 50f23da8e6249ab1be7a49922f5b38f9131d0b84 (patch) | |
| tree | 35cd79187cef2c5bea2b3c1473aadf453d174023 /pkgs/development/python-modules | |
| parent | 4a9ca1d8bba16f75e8dbaa35db3651ec4dd3f773 (diff) | |
| download | nixpkgs-50f23da8e6249ab1be7a49922f5b38f9131d0b84.tar nixpkgs-50f23da8e6249ab1be7a49922f5b38f9131d0b84.tar.gz nixpkgs-50f23da8e6249ab1be7a49922f5b38f9131d0b84.tar.bz2 nixpkgs-50f23da8e6249ab1be7a49922f5b38f9131d0b84.tar.lz nixpkgs-50f23da8e6249ab1be7a49922f5b38f9131d0b84.tar.xz nixpkgs-50f23da8e6249ab1be7a49922f5b38f9131d0b84.tar.zst nixpkgs-50f23da8e6249ab1be7a49922f5b38f9131d0b84.zip | |
python3Packages.py3exiv2: fix build
Recent boost versions name their `python3` shared objects `boost_python3x` rather than `boost_python3`. See https://hydra.nixos.org/build/80712295 Addresses #45960
Diffstat (limited to 'pkgs/development/python-modules')
| -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 d8633488102..4c6ca0bad33 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 bb4b1152347..8b0619c5bc5 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', |