From 3f6bf521fc77b663d1c56adfad8a21684884b6e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Jan 2004 17:23:34 +0000
Subject: [PATCH] * Flex required M4 at runtime.

svn path=/nixpkgs/trunk/; revision=734
---
 pkgs/development/tools/parsing/flex/builder-new.sh | 4 +++-
 pkgs/development/tools/parsing/flex/flex-new.nix   | 3 ++-
 pkgs/system/all-packages-generic.nix               | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/flex/builder-new.sh b/pkgs/development/tools/parsing/flex/builder-new.sh
index 42ec3fdb375c..e50cc48e4f61 100755
--- a/pkgs/development/tools/parsing/flex/builder-new.sh
+++ b/pkgs/development/tools/parsing/flex/builder-new.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-export buildinputs="$yacc"
+export buildinputs="$yacc $m4"
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1
@@ -8,3 +8,5 @@ cd flex-* || exit 1
 ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1
+
+echo "$m4" > $out/propagated-build-inputs || exit 1
diff --git a/pkgs/development/tools/parsing/flex/flex-new.nix b/pkgs/development/tools/parsing/flex/flex-new.nix
index fc5d880a0276..cc769faaac44 100644
--- a/pkgs/development/tools/parsing/flex/flex-new.nix
+++ b/pkgs/development/tools/parsing/flex/flex-new.nix
@@ -1,7 +1,7 @@
 # !!! this should be moved to default.nix eventually (but I delay
 # doing that since it would cause a rebuild of lots of stuff).
 
-{stdenv, fetchurl, yacc}:
+{stdenv, fetchurl, yacc, m4}:
 
 assert !isNull yacc;
 
@@ -15,4 +15,5 @@ derivation {
   };
   stdenv = stdenv;
   yacc = yacc;
+  m4 = m4;
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index a582e1e8f5ce..9e9aa9099dff 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -219,6 +219,7 @@
     fetchurl = fetchurl;
     stdenv = stdenv;
     yacc = bison;
+    m4 = gnum4;
   };
 
   gcc = (import ../development/compilers/gcc) {