JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vigra: use python2

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-10-18 17:07:46 +02:00
parent b08c00f67d
commit abaa750207
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/vigra/default.nix
View File

@ -1,7 +1,10 @@
{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase
, libjpeg, libpng, libtiff, numpy, openexr, python }:
, libjpeg, libpng, libtiff, openexr, python2Packages }:
stdenv.mkDerivation rec {
let
inherit (python2Packages) python numpy;
# Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
in stdenv.mkDerivation rec {
name = "vigra-${version}";
version = "1.10.0";

4
pkgs/top-level/all-packages.nix
View File

@ -9315,9 +9315,7 @@ in
vid-stab = callPackage ../development/libraries/vid-stab { };
vigra = callPackage ../development/libraries/vigra {
inherit (pkgs.pythonPackages) numpy;
};
vigra = callPackage ../development/libraries/vigra { };
vlock = callPackage ../misc/screensavers/vlock { };