Author: viric
Date: Sat Feb 25 16:47:21 2012
New Revision: 32557
URL: https://nixos.org/websvn/nix/?rev=32557&sc=1
Log:
Fixing jam for i686-linux. That should allow building trigger rally.
Modified:
nixpkgs/trunk/pkgs/development/tools/build-managers/jam/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/build-managers/jam/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/build-managers/jam/default.nix Sat Feb
25 15:54:57 2012 (r32556)
+++ nixpkgs/trunk/pkgs/development/tools/build-managers/jam/default.nix Sat Feb
25 16:47:21 2012 (r32557)
@@ -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 @@
installPhase = ''
ensureDir $out/bin
- cp bin.linux/jam $out/bin
+ cp ${bindir}/jam $out/bin
'';
meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
