Fixing jam for i686-linux. That should allow building trigger rally.

svn path=/nixpkgs/trunk/; revision=32557
This commit is contained in:
Lluís Batlle i Rossell 2012-02-25 16:47:21 +00:00
parent bfb0389d6c
commit 675e16f805

View File

@ -1,5 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
let
bindir = if stdenv.system == "i686-linux" then "bin.linuxx86"
else if stdenv.system == "x86_64-linux" then "bin.linux"
else throw "Unsupported platform by now";
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "jam-2.5"; name = "jam-2.5";
src = fetchurl { src = fetchurl {
@ -9,7 +15,7 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
ensureDir $out/bin ensureDir $out/bin
cp bin.linux/jam $out/bin cp ${bindir}/jam $out/bin
''; '';
meta = { meta = {