mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
libiconv: fix android cross-compile
This commit is contained in:
parent
ec1f3c7390
commit
d547fa17c5
@ -6,7 +6,7 @@
|
||||
|
||||
# assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "libiconv";
|
||||
version = "1.17";
|
||||
|
||||
@ -87,4 +87,7 @@ stdenv.mkDerivation rec {
|
||||
# This library is not needed on GNU platforms.
|
||||
hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd;
|
||||
};
|
||||
}
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.libc == "bionic") {
|
||||
# https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
|
||||
hardeningDisable = [ "fortify" ];
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user