Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
@@ -40,6 +40,8 @@
  # don't have "libgcc_s.so.1" on darwin
  LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";

+  configureFlags = [ "--with-libreadline-prefix" ];
+
  postInstall = ''
    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"