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

coreutils: Fix cross compilation for Android

Browse Source
This commit is contained in:
Bastian Köcher
2020-01-15 09:44:10 +01:00
committed by Frederik Rietdijk
parent 155fad6625
commit 320a4c1526
2 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/coreutils/default.nix
+7 -4
View File
@@ -15,7 +15,7 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
with lib;
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
pname = "coreutils";
version = "8.31";
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
# To be removed in coreutils-8.32.
++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch
# Fix compilation in musl-cross environments. To be removed in coreutils-8.32.
++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch;
++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch
# Fix compilation in android-cross environments. To be removed in coreutils-8.32.
++ [ ./coreutils-8.31-android-cross.patch ];
postPatch = ''
# The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
@@ -143,8 +145,9 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.eelco ];
};
} // optionalAttrs stdenv.hostPlatform.isMusl {
# Work around a bogus warning in conjunction with musl.
NIX_CFLAGS_COMPILE = "-Wno-error";
}
} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isAndroid {
NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0";
})