Merge 'staging' into master

2014-08-08 20:13:23 +02:00
parent 629f7d055a 777617f987
commit 52d9c93abe
220 changed files with 611 additions and 2164 deletions
--- a/pkgs/misc/emulators/bsod/default.nix
+++ b/pkgs/misc/emulators/bsod/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
  buildInputs = [ ncurses ];

  installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
    cp bsod $out/bin
  '';