diff options
| author | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
| commit | ea195b2507b9068d966009d27c0e90b57d88f30d (patch) | |
| tree | 287b4453ffa21139715bb1c1c57e6d01d1045295 /pkgs/development/tools/build-managers | |
| parent | 38e3d7bc86d2a48dd4d653fd3f142f422c075563 (diff) | |
| parent | 385f242a400749b3923d51fff5a86403e6dab0dc (diff) | |
| download | nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.gz nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.bz2 nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.lz nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.xz nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.tar.zst nixlib-ea195b2507b9068d966009d27c0e90b57d88f30d.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
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 6324fa92cbd9..434e23d9b990 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 = '' mkdir -p $out/bin - cp bin.linux/jam $out/bin + cp ${bindir}/jam $out/bin ''; meta = { |