graph-tool: cleanup

fucked up adding the changes

see #12647
This commit is contained in:
Robin Gloster 2016-01-30 20:27:16 +00:00
parent 6d92029239
commit ef4ff7a799

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4, { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
gobjectIntrospection, pygobject3, gtk3, matplotlib, autoconf, libtool }: gobjectIntrospection, pygobject3, gtk3, matplotlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.12"; version = "2.12";
@ -19,13 +19,12 @@ stdenv.mkDerivation rec {
sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl"; sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl";
}; };
preConfigure = '' configureFlags = [
patchShebangs autogen.sh "--with-python-module-path=$(out)/${python.sitePackages}"
./autogen.sh "--enable-openmp"
configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp" ];
'';
buildInputs = [ automake m4 pkgconfig makeWrapper autoconf libtool ]; buildInputs = [ pkgconfig autoreconfHook ];
propagatedBuildInputs = [ propagatedBuildInputs = [
boost boost