* Fix bison.

svn path=/nixpkgs/trunk/; revision=892

4 files changed, 9 insertions, 23 deletions

diff --git a/pkgs/development/tools/parsing/bison/bison-new.nix b/pkgs/development/tools/parsing/bison/bison-new.nix
index 43f66ce06a9c3..ce5b59b797abe 100644
--- a/pkgs/development/tools/parsing/bison/bison-new.nix
+++ b/pkgs/development/tools/parsing/bison/bison-new.nix
@@ -2,14 +2,13 @@
 
 assert m4 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "bison-1.875c";
-  system = stdenv.system;
-  builder = ./builder-new.sh;
   src = fetchurl {
     url = ftp://alpha.gnu.org/pub/gnu/bison/bison-1.875c.tar.gz;
     md5 = "bba317725fc84013b9d0a6b2576dfaa7";
   };
-  stdenv = stdenv;
-  m4 = m4;
+  buildInputs = [m4];
+} // {
+  glrSupport = true;
 }
diff --git a/pkgs/development/tools/parsing/bison/builder-new.sh b/pkgs/development/tools/parsing/bison/builder-new.sh
deleted file mode 100644
index cff4b60c8e0c3..0000000000000
--- a/pkgs/development/tools/parsing/bison/builder-new.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-buildinputs="$m4"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd bison-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/development/tools/parsing/bison/builder.sh b/pkgs/development/tools/parsing/bison/builder.sh
deleted file mode 100644
index 04bd1e2d29322..0000000000000
--- a/pkgs/development/tools/parsing/bison/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-buildinputs="$m4"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd bison-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 953915729e44b..7c08550b87f2e 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -1,11 +1,14 @@
 {stdenv, fetchurl, m4}:
+
 assert m4 != null;
+
 stdenv.mkDerivation {
   name = "bison-1.875";
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/bison/bison-1.875.tar.bz2;
     md5 = "b7f8027b249ebd4dd0cc948943a71af0";
   };
-  m4 = m4;
+  buildInputs = [m4];
+} // {
+  glrSupport = false;
 }