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

Merge pull request #45703 from dtzWill/fix/e2fsprogs-musl

Browse Source 
e2fsprogs: fix w/musl, __GNUC_PREREQ is glibc-ism
This commit is contained in:
Will Dietz 2018-08-28 09:15:28 -05:00 committed by GitHub
commit 4c2d822fad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/filesystems/e2fsprogs/default.nix
View File

@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig texinfo ]; nativeBuildInputs = [ pkgconfig texinfo ];
buildInputs = [ libuuid gettext ]; 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 = configureFlags =
if stdenv.isLinux then [ if stdenv.isLinux then [
"--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks" "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"