diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-15 15:45:37 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-15 15:45:37 +0200 |
| commit | b1916b45a374815c9f6101b9f6a30b35b7c92ecb (patch) | |
| tree | 08d7be26385fe1f69922cd985d7f2e68f27884f6 /pkgs/development/libraries/libidn | |
| parent | 0a941e0b66ab86cf359d4f158bda86c9742c4b2b (diff) | |
| parent | 79e7f7af9a2262f8d8e6bea2b32d18f24b668a0c (diff) | |
| download | nixlib-b1916b45a374815c9f6101b9f6a30b35b7c92ecb.tar nixlib-b1916b45a374815c9f6101b9f6a30b35b7c92ecb.tar.gz nixlib-b1916b45a374815c9f6101b9f6a30b35b7c92ecb.tar.bz2 nixlib-b1916b45a374815c9f6101b9f6a30b35b7c92ecb.tar.lz nixlib-b1916b45a374815c9f6101b9f6a30b35b7c92ecb.tar.xz nixlib-b1916b45a374815c9f6101b9f6a30b35b7c92ecb.tar.zst nixlib-b1916b45a374815c9f6101b9f6a30b35b7c92ecb.zip | |
Merge remote-tracking branch 'upstream/staging' into gcc-7
Conflicts: pkgs/development/libraries/libidn/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/libidn')
| -rw-r--r-- | pkgs/development/libraries/libidn/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index c6b7bcf84dff..54d669f1913b 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "info" "devdoc" ]; # broken with gcc-7 - #doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin; + #doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isMusl; hardeningDisable = [ "format" ]; |