From 5ad7aedf63fd7111699b92c2ea5546027e22d35a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 23 Sep 2018 22:39:21 +0200 Subject: [PATCH] pythonPackages.pyftgl: fix build (#47232) See https://hydra.nixos.org/build/80705583 Recent `boost` versions with `python` enabled have changed their naming scheme for `boost_python` shared objects which causes issues with the proper linking when building `pyftgl`. Previously the library was named `boost_python3`, no it's named `boost_python36` for current python (3.6.x). The same issue applies for the `python2`. Addresses #45960 --- .../python-modules/pyftgl/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index a85837472255..1163f007b092 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -1,5 +1,13 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k -, boost, freetype, ftgl, libGLU_combined }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +, boost, freetype, ftgl, libGLU_combined +, python +}: + +let + + pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; + +in buildPythonPackage rec { pname = "pyftgl"; @@ -13,13 +21,13 @@ buildPythonPackage rec { sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; - postPatch = stdenv.lib.optional isPy3k '' - sed -i "s,'boost_python','boost_python3',g" setup.py + postPatch = '' + sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py ''; buildInputs = [ boost freetype ftgl libGLU_combined ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for FTGL (FreeType for OpenGL)"; license = licenses.gpl2Plus; };