diff options
author | Ben Gamari <ben@smart-cactus.org> | 2017-10-15 12:03:00 -0400 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-01-22 16:51:30 -0600 |
commit | e6f9e82ee462c912ec01754d26596f0a5d8a8c23 (patch) | |
tree | f4cc2bcb53762861a2fd1323c875f0da94c149da /pkgs/development | |
parent | 4e5a4a92e898e8255ff3a8d2c9293abfd48168e8 (diff) | |
download | nixlib-e6f9e82ee462c912ec01754d26596f0a5d8a8c23.tar nixlib-e6f9e82ee462c912ec01754d26596f0a5d8a8c23.tar.gz nixlib-e6f9e82ee462c912ec01754d26596f0a5d8a8c23.tar.bz2 nixlib-e6f9e82ee462c912ec01754d26596f0a5d8a8c23.tar.lz nixlib-e6f9e82ee462c912ec01754d26596f0a5d8a8c23.tar.xz nixlib-e6f9e82ee462c912ec01754d26596f0a5d8a8c23.tar.zst nixlib-e6f9e82ee462c912ec01754d26596f0a5d8a8c23.zip |
flex: Use native dependencies where applicable
Flex needs both a C compiler for the build environment, as well as a native m4. (cherry picked from commit 81827c0084c1a69e41894a4d38b0c0b267eaff34)
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/parsing/flex/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 4ea11a622ea1..55fe7db80077 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, m4 +{ stdenv, buildPackages, fetchurl, bison, m4 , fetchpatch, autoreconfHook, help2man }: @@ -19,11 +19,10 @@ stdenv.mkDerivation rec { + "/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch"; sha256 = "1aarhcmz7mfrgh15pkj6f7ikxa2m0mllw1i1vscsf1kw5d05lw6f"; })]; - nativeBuildInputs = [ autoreconfHook help2man ]; + nativeBuildInputs = [ buildPackages.stdenv.cc autoreconfHook help2man ]; buildInputs = [ bison ]; - - propagatedBuildInputs = [ m4 ]; + nativePropagatedBuildInputs = [ m4 ]; postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' |