From 02fc4551f5d1eeb657cddea4658eb4212518311c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 4 Sep 2015 22:22:51 +0300 Subject: [PATCH] julia: fix i686 build --- pkgs/development/compilers/julia/0.3.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 76dc6aa1d30..7f0f263283d 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -68,17 +68,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ]; 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}"); - in [ - "ARCH=${arch}" - "MARCH=${march}" - "JULIA_CPU_TARGET=${march}" + [ "PREFIX=$(out)" "prefix=$(out)" "SHELL=${stdenv.shell}"