From abaa750207470a74066651602a76500618837bfa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 18 Oct 2016 17:07:46 +0200 Subject: [PATCH] vigra: use python2 --- pkgs/development/libraries/vigra/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 1dc35db43f9..c122928eddd 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5b1daa61e0..0facd15a9a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };