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

torch: find libjpeg and libpng, use compatible openblas

Browse Source
This commit is contained in:
Michael Raskin 2016-08-27 15:40:05 +02:00
parent 3f70fcd4c1
commit 2e0c1c3758
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/torch/default.nix
View File

@ -1,18 +1,32 @@
{stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot, {stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot
libjpeg_turbo, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip}: , libjpeg, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip
, pkgconfig, zlib, libX11, which
}:
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
version = "0.0pre20160820"; version = "0.0pre20160820";
name = "torch-${version}"; name = "torch-${version}";
buildInputs = [ buildInputs = [
luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4 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); src = fetchgit (stdenv.lib.importJSON ./src.json);
configurePhase = ''
'';
buildPhase = '' buildPhase = ''
cd .. cd ..
export PREFIX=$out 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" mkdir "$out"
sh install.sh -s sh install.sh -s
''; '';

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

@ -9594,7 +9594,9 @@ in
tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { }; tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };
torch = callPackage ../development/libraries/torch {}; torch = callPackage ../development/libraries/torch {
openblas = openblasCompat;
};
tremor = callPackage ../development/libraries/tremor { }; tremor = callPackage ../development/libraries/tremor { };