BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

julia: Fix i686-linux build

Browse source
This commit is contained in:
Thomas Tuegel 2015-09-19 09:39:23 -05:00
commit 78634c7a54
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/development/compilers/julia/0.3.nix
View file

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
md5 = "cb61be3be7254eae39684612c524740d";
};
in [ dsfmt_src llvm.src ];
in [ dsfmt_src ];
prePatch = ''
copy_kill_hash(){
@ -70,22 +70,18 @@ stdenv.mkDerivation rec {
sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
'';
buildInputs =
[ libunwind readline utf8proc zlib
double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
openblas arpack suitesparse
];
buildInputs = [
arpack double_conversion fftw fftwSinglePrec glpk gmp libunwind
llvm mpfr pcre openblas readline suitesparse utf8proc zlib
];
nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
nativeBuildInputs = [ gfortran git m4 patchelf perl python2 which ];
makeFlags =
let
arch = head (splitString "-" stdenv.system);
march =
{ "x86_64-linux" = "x86-64";
"x86_64-darwin" = "x86-64";
"i686-linux" = "i686";
}."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
or (throw "unsupported architecture: ${arch}");
in [
"ARCH=${arch}"
"MARCH=${march}"
@ -108,6 +104,7 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_GMP=1"
"USE_SYSTEM_GRISU=1"
"USE_SYSTEM_LIBUNWIND=1"
"USE_SYSTEM_LLVM=1"
"USE_SYSTEM_MPFR=1"
"USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1"
@ -143,6 +140,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Test fail on i686 (julia version 0.3.10)
doCheck = !stdenv.isi686;
checkTarget = "testall";
meta = {
@ -150,6 +149,6 @@ stdenv.mkDerivation rec {
homepage = "http://julialang.org/";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
};
}

5
pkgs/development/compilers/llvm/3.3/llvm.nix
View file

@ -12,6 +12,11 @@ in stdenv.mkDerivation rec {
patches = [
./more-memory-for-bugpoint.patch # The default rlimits in 3.3 are too low for shared libraries.
./no-rule-aarch64.patch # http://llvm.org/bugs/show_bug.cgi?id=16625
# Patch needed for Julia, backports fixes from LLVM 3.5
(fetchurl {
url = "https://raw.githubusercontent.com/JuliaLang/julia/3bdda3750efc4ebf8ce7eda8a0888ffef3851605/deps/llvm-3.3.patch";
sha256 = "0j6chyx4k8zr1qha5dks8lqlcraqrj4q1hwnk2kj3qi6cajsd8k3";
})
];
buildInputs = [ perl groff cmake python libffi ];