diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 13:03:41 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 13:03:41 +0000 |
| commit | afb26b6aed110266571a7a0c0f14d10e78da0571 (patch) | |
| tree | 012dcdf20b468712a5d709ac5877939698ab2fea /pkgs | |
| parent | 950d8f5d6034493b03ec75198882118eb17c8004 (diff) | |
| download | nixpkgs-afb26b6aed110266571a7a0c0f14d10e78da0571.tar nixpkgs-afb26b6aed110266571a7a0c0f14d10e78da0571.tar.gz nixpkgs-afb26b6aed110266571a7a0c0f14d10e78da0571.tar.bz2 nixpkgs-afb26b6aed110266571a7a0c0f14d10e78da0571.tar.lz nixpkgs-afb26b6aed110266571a7a0c0f14d10e78da0571.tar.xz nixpkgs-afb26b6aed110266571a7a0c0f14d10e78da0571.tar.zst nixpkgs-afb26b6aed110266571a7a0c0f14d10e78da0571.zip | |
vigra-1.8.0
svn path=/nixpkgs/trunk/; revision=32346
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/vigra/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 5b3b119cb1d..93ed2869d0e 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python, fftw }: -stdenv.mkDerivation { - name = "vigra-1.7.0"; +{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python, + fftw, fftwSinglePrec, hdf5, boost, numpy }: +stdenv.mkDerivation rec { + name = "vigra-1.8.0"; src = fetchurl { - url = http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.7.0-src.tar.gz; - sha256 = "1laf9p0h35xpzs98yd13alm17gh40sn9b7z01ylcja4g7p3a3hs4"; + url = "${meta.homepage}/${name}-src.tar.gz"; + sha256 = "0542qy1bqaq73l7i8aqdhwdbhd6m1wldsn1w2sfyf8yf4398ffpw"; }; - buildInputs = [ cmake fftw libtiff libpng libjpeg doxygen python ]; + buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost + numpy hdf5 ]; cmakeFlags = if (stdenv.system == "x86_64-linux") then "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f557af424db..d316a08b09c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4725,7 +4725,9 @@ let vcdimager = callPackage ../development/libraries/vcdimager { }; - vigra = callPackage ../development/libraries/vigra { }; + vigra = callPackage ../development/libraries/vigra { + inherit (pkgs.pythonPackages) numpy; + }; vmime = callPackage ../development/libraries/vmime { }; |