3
0
Fork 0
forked from mirrors/nixpkgs

Update Julia / account for it now using patchelf

This commit is contained in:
Michael Raskin 2012-11-28 16:19:26 +04:00
parent 2671e32c20
commit 19b638f5c7

View file

@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
arpack_ver = "3.1.2";
clp_ver = "1.14.5";
lighttpd_ver = "1.4.29";
patchelf_ver = "0.6";
grisu_src = fetchurl {
url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
@ -52,11 +53,15 @@ stdenv.mkDerivation rec {
url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz";
sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85";
};
patchelf_src = fetchurl {
url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw";
};
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "51076ef4c1b269de738b6185865b389601627eb7";
sha256 = "1hbhxdiymkv0pd4dhr9wbvh1566ivfffhmafsjh8jcwh2f9fz90b";
rev = "53598b026b6fd9f79eba02cbc4e2d6c38ca32bd7";
sha256 = "159yasgfbbj6px16kgwf7bg478giv8zbm5hg90ipncp1ls2lv3jy";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
@ -75,13 +80,14 @@ stdenv.mkDerivation rec {
cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
}
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" ; do
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" ; do
copy_kill_hash "$i" deps
done
copy_kill_hash "${dsfmt_src}" deps/random
${if realGcc ==null then "" else
''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz "''}
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
sed -e 's@ cpp @ gcc -E @g' -i base/Makefile
@ -103,6 +109,9 @@ stdenv.mkDerivation rec {
preBuild = ''
make -C test/unicode all SHELL="${stdenv.shell}"
make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" SHELL="${stdenv.shell}"
mkdir -p usr/lib
ln -s libuv.a usr/lib/uv.a
'';
postInstall = ''