diff options
| author | Robin Gloster <mail@glob.in> | 2016-01-30 20:27:16 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-01-30 20:27:16 +0000 |
| commit | ef4ff7a799ea98b46ce72edee9606f0966e3399f (patch) | |
| tree | 40a806e944528ce5f1249a830e6ba388806b7403 /pkgs/development/python-modules/graph-tool/2.x.x.nix | |
| parent | 6d92029239d94898c3c09da99b341155f670e492 (diff) | |
| download | nixpkgs-ef4ff7a799ea98b46ce72edee9606f0966e3399f.tar nixpkgs-ef4ff7a799ea98b46ce72edee9606f0966e3399f.tar.gz nixpkgs-ef4ff7a799ea98b46ce72edee9606f0966e3399f.tar.bz2 nixpkgs-ef4ff7a799ea98b46ce72edee9606f0966e3399f.tar.lz nixpkgs-ef4ff7a799ea98b46ce72edee9606f0966e3399f.tar.xz nixpkgs-ef4ff7a799ea98b46ce72edee9606f0966e3399f.tar.zst nixpkgs-ef4ff7a799ea98b46ce72edee9606f0966e3399f.zip | |
graph-tool: cleanup
fucked up adding the changes see #12647
Diffstat (limited to 'pkgs/development/python-modules/graph-tool/2.x.x.nix')
| -rw-r--r-- | pkgs/development/python-modules/graph-tool/2.x.x.nix | 17 |
1 files changed, 8 insertions, 9 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 445a4313990..be1592f864f 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4, -pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper, -gobjectIntrospection, pygobject3, gtk3, matplotlib, autoconf, libtool }: +{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, +pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, +gobjectIntrospection, pygobject3, gtk3, matplotlib }: stdenv.mkDerivation rec { version = "2.12"; @@ -19,13 +19,12 @@ stdenv.mkDerivation rec { sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl"; }; - preConfigure = '' - patchShebangs autogen.sh - ./autogen.sh - configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp" - ''; + configureFlags = [ + "--with-python-module-path=$(out)/${python.sitePackages}" + "--enable-openmp" + ]; - buildInputs = [ automake m4 pkgconfig makeWrapper autoconf libtool ]; + buildInputs = [ pkgconfig autoreconfHook ]; propagatedBuildInputs = [ boost |