Making bison 2.4 and 2.5 cross build (I hope), and setting the main bison as

2.5. Let's see what builds and what not.


svn path=/nixpkgs/branches/stdenv-updates/; revision=29406
This commit is contained in:
Lluís Batlle i Rossell 2011-09-21 06:18:23 +00:00
parent 8715ac105b
commit 99863cb87b
3 changed files with 5 additions and 3 deletions

View File

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "019s3pdzggb71g7p7dgajhh53gh0h6nfl4yrzrs0jzsc37ph4lwk";
};
buildInputs = [m4];
buildNativeInputs = [m4];
propagatedBuildInputs = [m4];
doCheck = true;

View File

@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1f1rai3v6k6xjii94964iq0alhc2hxwapqa363nfj8rbxvv0sdqa";
};
buildInputs = [ m4 ]
buildNativeInputs = [ m4 ]
++ stdenv.lib.optional doCheck perl;
propagatedBuildInputs = [ m4 ];
doCheck = true;

View File

@ -2706,7 +2706,7 @@ let
cross = assert crossSystem != null; crossSystem;
});
bison = bison24;
bison = bison25;
bison1875 = callPackage ../development/tools/parsing/bison/bison-1.875.nix { };