From 066614a526a5c94ff48e8e4efb5b41192aa1d405 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 16 Dec 2018 00:10:33 +0100 Subject: [PATCH] pythonPackages.graph-tool: fix build (#52261) The new version of cgal introduced in #47826 requires a patch (that will be included in the next graph-tool version). Fixes #50446 --- .../python-modules/graph-tool/2.x.x.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index cd8f7c0c91ba..7c83039ecdb9 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, -pkgconfig, boost, expat, scipy, cgal, gmp, mpfr, -gobject-introspection, pygobject3, gtk3, matplotlib, ncurses, -buildPythonPackage }: +{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook +, pkgconfig, boost, expat, scipy, cgal, gmp, mpfr +, gobject-introspection, pygobject3, gtk3, matplotlib, ncurses +, buildPythonPackage +, fetchpatch +}: buildPythonPackage rec { pname = "graph-tool"; @@ -20,6 +22,15 @@ buildPythonPackage rec { sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz"; }; + patches = [ + # fix build with cgal 4.13 (https://git.skewed.de/count0/graph-tool/issues/509) + (fetchpatch { + name = "cgal-4.13.patch"; + url = "https://git.skewed.de/count0/graph-tool/commit/aa39e4a6b42d43fac30c841d176c75aff92cc01a.patch"; + sha256 = "1578inb4jqwq2fhhwscn5z95nzmaxvmvk30nzs5wirr26iznap4m"; + }) + ]; + configureFlags = [ "--with-python-module-path=$(out)/${python.sitePackages}" "--with-boost-libdir=${boost}/lib"