diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2021-08-23 12:12:17 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2022-02-27 10:25:34 +0100 |
commit | 49028fb110ffb19e5326879d7ec6245ebd0315d2 (patch) | |
tree | bad39ab51e874a9eec8a19859615c71ddc0eeb86 | |
parent | 7bc32b3e5cc623a7b4b0fad900db26258592b9e6 (diff) | |
download | nixpkgs-49028fb110ffb19e5326879d7ec6245ebd0315d2.tar nixpkgs-49028fb110ffb19e5326879d7ec6245ebd0315d2.tar.gz nixpkgs-49028fb110ffb19e5326879d7ec6245ebd0315d2.tar.bz2 nixpkgs-49028fb110ffb19e5326879d7ec6245ebd0315d2.tar.lz nixpkgs-49028fb110ffb19e5326879d7ec6245ebd0315d2.tar.xz nixpkgs-49028fb110ffb19e5326879d7ec6245ebd0315d2.tar.zst nixpkgs-49028fb110ffb19e5326879d7ec6245ebd0315d2.zip |
findutils: fix build w/glibc-2.34
This "-D__nonnull\\(params\\)=" leads to a compilation failure in e.g. the configure phase: configure:21131: gcc -c -D__nonnull\(params\)= conftest.c >&5 <command-line>: warning: ISO C99 requires whitespace after the macro name <command-line>: error: stray '\' in program <command-line>: error: expected ',' or ';' before '(' token <command-line>: error: stray '\' in program According to the commit this isn't even needed on Linux. I confirmed that this is an (expectable) glibc-2.34 thing by checking that * the issue doesn't occur with gcc 10/11 on a recent glibc-2.33 staging. * the issue DOES occur in a docker container with Fedora rawhide (which has glibc 2.34 and gcc 11).
-rw-r--r-- | pkgs/tools/misc/findutils/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 3746c4b4657..56d710c8545 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var/cache" ]; - CFLAGS = [ + CFLAGS = lib.optionals stdenv.isDarwin [ # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972 # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478 "-D__nonnull\\(params\\)=" |