summary refs log tree commit diff
path: root/pkgs/development/tools/parsing
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-11-08 10:18:35 +0000
committerPeter Simons <simons@cryp.to>2011-11-08 10:18:35 +0000
commit368ac01473c8beae0f879bb33ee06a9d54e942c4 (patch)
treef68790020f625a0f7ce4de68cf388fb0b75f6908 /pkgs/development/tools/parsing
parent91ab98ce09f5f7d62932d198f678663d0cf40721 (diff)
parentd5a21a68e5862ff3604f5b657bb4031ce76129e6 (diff)
downloadnixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar
nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.gz
nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.bz2
nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.lz
nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.xz
nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.tar.zst
nixlib-368ac01473c8beae0f879bb33ee06a9d54e942c4.zip
synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
Diffstat (limited to 'pkgs/development/tools/parsing')
-rw-r--r--pkgs/development/tools/parsing/bison/bison-2.4.nix1
-rw-r--r--pkgs/development/tools/parsing/flex/flex-2.5.35.nix9
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix
index 8fda9e3a0875..a79a5e96381e 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.4.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
   };
 
   buildNativeInputs = [m4];
-  propagatedBuildInputs = [m4];
 
   doCheck = true;
 
diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix
index c200e4e7d2f7..66ece227c924 100644
--- a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix
@@ -11,7 +11,14 @@ stdenv.mkDerivation {
     sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
   };
   buildInputs = [yacc];
-  propagatedBuildInputs = [m4];
+  propagatedBuildNativeInputs = [m4];
+
+  crossAttrs = {
+    preConfigure = ''
+      export ac_cv_func_malloc_0_nonnull=yes
+      export ac_cv_func_realloc_0_nonnull=yes
+    '';
+  };
 
   meta = {
     description = "A fast lexical analyser generator";