Merge staging into master

2018-04-11 14:55:52 +02:00
parent 392874b9b1 617c26df84
commit ee6894ca12
598 changed files with 9599 additions and 7743 deletions
@@ -58,8 +58,6 @@ stdenv.mkDerivation {
      + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
      + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
      + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ")
-      # XXX: USE_PCRE2 might be useful in general, look into it
-      # XXX other alpine options?
      + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else "");

  # build git-credential-osxkeychain if darwin