Merge: make dev output references explicit

This is a rebase of most commits from #14766, resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
parent bfd522da63 c02f0ade90
commit c4661e9643
199 changed files with 308 additions and 306 deletions
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ];

  configureFlags = [
-    "--with-ssl-incl-dir=${openssl}/include"
+    "--with-ssl-incl-dir=${openssl.dev}/include"
    "--with-ssl-lib-dir=${openssl.out}/lib"
  ] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ];