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

julia03: use system utf8proc

Browse Source
This commit is contained in:
Thomas Tuegel 2015-06-04 12:38:36 -05:00
parent 63be59abc7
commit b255f8df2e
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/compilers/julia/0.3.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
, ncurses, libunistring, patchelf, openblas, arpack , ncurses, patchelf, openblas, arpack
, tcl, tk, xproto, libX11, git, mpfr, which , tcl, tk, xproto, libX11, git, mpfr, which, utf8proc
}: }:
with stdenv.lib; with stdenv.lib;
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
let let
dsfmt_ver = "2.2"; dsfmt_ver = "2.2";
grisu_ver = "1.1.1"; grisu_ver = "1.1.1";
utf8proc_ver = "1.1.6";
dsfmt_src = fetchurl { dsfmt_src = fetchurl {
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
@ -38,19 +37,17 @@ stdenv.mkDerivation rec {
url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
md5 = "29b533ed4311161267bff1a9a97e2953"; md5 = "29b533ed4311161267bff1a9a97e2953";
}; };
utf8proc_src = fetchurl { in [ dsfmt_src grisu_src ];
url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
md5 = "2462346301fac2994c34f5574d6c3ca7";
};
in [ dsfmt_src grisu_src utf8proc_src ];
buildInputs = buildInputs =
[ [
gfortran perl m4 gmp pcre llvm readline zlib gfortran gmp pcre llvm readline zlib
fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf fftw fftwSinglePrec libunwind suitesparse glpk ncurses
arpack openblas tcl tk xproto libX11 git mpfr which arpack openblas tcl tk xproto libX11 mpfr utf8proc
]; ];
nativeBuildInputs = [ patchelf perl m4 which git ];
makeFlags = makeFlags =
let let
arch = head (splitString "-" stdenv.system); arch = head (splitString "-" stdenv.system);
@ -78,6 +75,8 @@ stdenv.mkDerivation rec {
"LIBLAPACKNAME=libopenblas" "LIBLAPACKNAME=libopenblas"
"USE_SYSTEM_ARPACK=1" "USE_SYSTEM_ARPACK=1"
"USE_SYSTEM_UTF8PROC=1"
]; ];
GLPK_PREFIX = "${glpk}/include"; GLPK_PREFIX = "${glpk}/include";
@ -109,7 +108,6 @@ stdenv.mkDerivation rec {
"-lopenblas" "-lopenblas"
"-lpcre" "-lpcre"
"-lsuitesparse" "-lsuitesparse"
"-lunistring"
"-lz" "-lz"
]; ];