Merge branch 'staging' into fix-ncurses-darwin-extensions

2018-05-02 15:40:38 -05:00
parent b4d9113fbf 3513034208
commit eeb016e8f0
251 changed files with 2068 additions and 1387 deletions
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -119,6 +119,8 @@ stdenv.mkDerivation rec {
    ++ optional openGLSupport "--enable-opengl"
    ++ optional virglSupport "--enable-virglrenderer";

+  doCheck = false; # tries to access /dev
+
  postFixup =
    ''
      for exe in $out/bin/qemu-system-* ; do