diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix index 8700378ae75d..254c210a61ed 100644 --- a/pkgs/development/libraries/torch/default.nix +++ b/pkgs/development/libraries/torch/default.nix @@ -1,18 +1,32 @@ -{stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot, - libjpeg_turbo, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip}: +{stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot + , libjpeg, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip + , pkgconfig, zlib, libX11, which + }: stdenv.mkDerivation rec{ version = "0.0pre20160820"; name = "torch-${version}"; buildInputs = [ luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4 - libjpeg_turbo zeromq3 ncurses openssl libpng readline + libjpeg zeromq3 ncurses openssl libpng readline pkgconfig + zlib libX11 which ]; src = fetchgit (stdenv.lib.importJSON ./src.json); - configurePhase = '' - ''; buildPhase = '' cd .. export PREFIX=$out + + include= + for i in $NIX_CFLAGS_COMPILE; do + if test -n "$include" && test -d "$i"; then + export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH''${CMAKE_INCLUDE_PATH:+:}$i" + fi; + if test "x$i" = "x-isystem"; then + include=1 + else + include= + fi + done + mkdir "$out" sh install.sh -s ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74bde248417b..5ac70fdcc4b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9594,7 +9594,9 @@ in tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { }; - torch = callPackage ../development/libraries/torch {}; + torch = callPackage ../development/libraries/torch { + openblas = openblasCompat; + }; tremor = callPackage ../development/libraries/tremor { };