Merge branch 'staging', containing closure-size #7701

2016-04-13 09:25:28 +02:00
parent 81cedab4f1 87b49397bf
commit 39ebb01d6e
882 changed files with 8958 additions and 2482 deletions
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
    for p in $out/bin/*
      do wrapProgram "$p" \
      --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \
-      --prefix PATH ":" "${which}/bin:${bzip2}/bin"
+      --prefix PATH ":" "${which}/bin:${bzip2.bin}/bin"
    done

    patchShebangs $out