From 675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 25 Feb 2012 16:47:21 +0000 Subject: [PATCH] Fixing jam for i686-linux. That should allow building trigger rally. svn path=/nixpkgs/trunk/; revision=32557 --- pkgs/development/tools/build-managers/jam/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index d2a002a70cf..6e2d79c6400 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -1,5 +1,11 @@ {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 { name = "jam-2.5"; src = fetchurl { @@ -9,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' ensureDir $out/bin - cp bin.linux/jam $out/bin + cp ${bindir}/jam $out/bin ''; meta = {