Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-04-18 13:49:22 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
@@ -20,8 +20,9 @@ stdenv.mkDerivation {
    ++ stdenv.lib.optional (!stdenv.isDarwin) pam;

  patchPhase = ''
-    sed -i -e s,/usr/local/ssl,${openssl}, \
-      src/osdep/unix/Makefile
+    sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl},'
+    sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,'
+    sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,'
  '';

  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin