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
@@ -47,7 +47,7 @@ let
    patchPhase = ''
      (cd pixie-src
       patch -p1 < ${./load_paths.patch}
-       libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.out}" "${zlib}"]'
+       libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]'
       export libraryPaths
       substituteAllInPlace ./pixie/ffi-infer.pxi)
    '';