From a3f8a2c56f8e40be638d6b5b9df54dab1d8b4ba4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 28 Aug 2018 06:45:52 -0500 Subject: e2fsprogs: fix w/musl, __GNUC_PREREQ is glibc-ism Fixes compilation on non-glibc at minor cost since these are only used to guard the use of pragmas selectively disabling warnings based on the GCC version used. --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/tools/filesystems/e2fsprogs/default.nix') diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index d5f43e317024..e2b87007b09f 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig texinfo ]; buildInputs = [ libuuid gettext ]; + # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc + NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") + "-D__GNUC_PREREQ(maj,min)=0"; + configureFlags = if stdenv.isLinux then [ "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks" -- cgit 1.4.1