* Fixed flex-new.

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

4 files changed, 7 insertions, 28 deletions

diff --git a/pkgs/development/tools/parsing/flex/builder-new.sh b/pkgs/development/tools/parsing/flex/builder-new.sh
deleted file mode 100644
index 55947cd7e8c75..0000000000000
--- a/pkgs/development/tools/parsing/flex/builder-new.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-export buildinputs="$yacc $m4"
-. $stdenv/setup
-
-tar xvfj $src
-cd flex-*
-./configure --prefix=$out
-make
-make install
-
-mkdir $out/nix-support
-echo "$m4" > $out/nix-support/propagated-build-inputs
diff --git a/pkgs/development/tools/parsing/flex/builder.sh b/pkgs/development/tools/parsing/flex/builder.sh
deleted file mode 100644
index e032b03171514..0000000000000
--- a/pkgs/development/tools/parsing/flex/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-export buildinputs="$yacc"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd flex-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index b48a1d8621fab..2cd01a28276af 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, yacc}:
+
 assert yacc != null;
+
 stdenv.mkDerivation {
   name = "flex-2.5.4a";
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/flex/flex-2.5.4a.tar.gz;
     md5 = "bd8753d0b22e1f4ec87a553a73021adf";
   };
-  yacc = yacc;
+  buildInputs = [yacc];
 }
diff --git a/pkgs/development/tools/parsing/flex/flex-new.nix b/pkgs/development/tools/parsing/flex/flex-new.nix
index 6da54271823b2..e102a1d079351 100644
--- a/pkgs/development/tools/parsing/flex/flex-new.nix
+++ b/pkgs/development/tools/parsing/flex/flex-new.nix
@@ -3,17 +3,14 @@
 
 {stdenv, fetchurl, yacc, m4}:
 
-assert yacc != null;
+assert yacc != null && m4 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "flex-2.5.31";
-  system = stdenv.system;
-  builder = ./builder-new.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/lex/flex-2.5.31.tar.bz2;
     md5 = "363dcc4afc917dc51306eb9d3de0152f";
   };
-  stdenv = stdenv;
-  yacc = yacc;
-  m4 = m4;
+  buildInputs = [yacc];
+  propagatedBuildInputs = [m4];
 }