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
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
    cp unetbootin.desktop $out/share/applications

    wrapProgram $out/bin/unetbootin \
-      --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
+      --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]}
  '';

  meta = with stdenv.lib; {