From 99863cb87b3231e6bfef139a7b54c35f6aa63a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Sep 2011 06:18:23 +0000 Subject: [PATCH] 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 --- pkgs/development/tools/parsing/bison/bison-2.4.nix | 3 ++- pkgs/development/tools/parsing/bison/bison-2.5.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix index 61ce9b895db..8fda9e3a087 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.4.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "019s3pdzggb71g7p7dgajhh53gh0h6nfl4yrzrs0jzsc37ph4lwk"; }; - buildInputs = [m4]; + buildNativeInputs = [m4]; + propagatedBuildInputs = [m4]; doCheck = true; diff --git a/pkgs/development/tools/parsing/bison/bison-2.5.nix b/pkgs/development/tools/parsing/bison/bison-2.5.nix index e373a80e46d..87753d472f3 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.5.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.5.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1f1rai3v6k6xjii94964iq0alhc2hxwapqa363nfj8rbxvv0sdqa"; }; - buildInputs = [ m4 ] + buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; + propagatedBuildInputs = [ m4 ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dbc58aa27d..4c333d95ee6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2706,7 +2706,7 @@ let cross = assert crossSystem != null; crossSystem; }); - bison = bison24; + bison = bison25; bison1875 = callPackage ../development/tools/parsing/bison/bison-1.875.nix { };