Merge branch 'master' into staging

2016-08-23 18:50:06 +01:00
parent 13c04c837d 415e1983ca
commit 0e8d2725dc
244 changed files with 767 additions and 597 deletions
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  postPatch = ''
    for i in squeak.in squeak.sh.in; do
      substituteInPlace unix/cmake/$i --replace "PATH=" \
-        "PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #"
+        "PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #"
    done
  '';