public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flex: Don't use crossAttrs

Browse Source
This commit is contained in:
John Ericson 2018-07-23 17:35:23 -04:00
parent 4116754f45
commit 1833a04aed
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/parsing/flex/2.5.35.nix
View File

@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ m4 ]; propagatedBuildInputs = [ m4 ];
crossAttrs = { preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
preConfigure = '' "ac_cv_func_malloc_0_nonnull=yes"
export ac_cv_func_malloc_0_nonnull=yes "ac_cv_func_realloc_0_nonnull=yes"
export ac_cv_func_realloc_0_nonnull=yes ];
'';
};
meta = { meta = {
branch = "2.5.35"; branch = "2.5.35";

15
pkgs/development/tools/parsing/flex/2.6.1.nix
View File

@ -12,23 +12,20 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ m4 ]; propagatedBuildInputs = [ m4 ];
preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
];
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
sed -i Makefile -e 's/-no-undefined//;' sed -i Makefile -e 's/-no-undefined//;'
''; '';
crossAttrs = {
# disable tests which can't run on build machine # disable tests which can't run on build machine
postPatch = '' postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace Makefile.in --replace "tests" " "; substituteInPlace Makefile.in --replace "tests" " ";
''; '';
preConfigure = ''
export ac_cv_func_malloc_0_nonnull=yes
export ac_cv_func_realloc_0_nonnull=yes
'';
};
meta = { meta = {
homepage = https://github.com/westes/flex; homepage = https://github.com/westes/flex;
description = "A fast lexical analyser generator"; description = "A fast lexical analyser generator";