Merge remote-tracking branch 'upstream/staging' into strictDeps

2018-05-14 23:33:03 -04:00
parent 330ca731e8 0fc21a364b
commit 5e17335bd7
4956 changed files with 139379 additions and 92174 deletions
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
  # HACK, see #10874 (and 14664)
  buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv;

-  setupHook = ./gettext-setup-hook.sh;
+  setupHooks = [
+    ../../../build-support/setup-hooks/role.bash
+    ./gettext-setup-hook.sh
+  ];
+  gettextNeedsLdflags = hostPlatform.libc != "glibc" && !hostPlatform.isMusl;

  enableParallelBuilding = true;