diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-02-25 16:47:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-02-25 16:47:21 +0000 |
| commit | 675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a (patch) | |
| tree | 8a5fd3dd48b45963f1f3427ab172721ebfaac521 /pkgs/development/tools/build-managers | |
| parent | bfb0389d6cf2caa6f017f11f9fd9a488713b89f9 (diff) | |
| download | nixlib-675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a.tar nixlib-675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a.tar.gz nixlib-675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a.tar.bz2 nixlib-675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a.tar.lz nixlib-675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a.tar.xz nixlib-675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a.tar.zst nixlib-675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a.zip | |
Fixing jam for i686-linux. That should allow building trigger rally.
svn path=/nixpkgs/trunk/; revision=32557
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/jam/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index d2a002a70cf7..6e2d79c6400d 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 = { |