summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-08-16 18:08:49 +0200
committerVladimír Čunát <v@cunat.cz>2020-08-16 18:25:31 +0200
commit0a3386369c79f37e060c098eed727a26cc6b08ee (patch)
tree3c6def41734e4a72a64886ffc013d5583acd22b0 /nixos
parenta29106ea699bfcd040c6f7feb19b1c8bbe56bce2 (diff)
downloadnixpkgs-0a3386369c79f37e060c098eed727a26cc6b08ee.tar
nixpkgs-0a3386369c79f37e060c098eed727a26cc6b08ee.tar.gz
nixpkgs-0a3386369c79f37e060c098eed727a26cc6b08ee.tar.bz2
nixpkgs-0a3386369c79f37e060c098eed727a26cc6b08ee.tar.lz
nixpkgs-0a3386369c79f37e060c098eed727a26cc6b08ee.tar.xz
nixpkgs-0a3386369c79f37e060c098eed727a26cc6b08ee.tar.zst
nixpkgs-0a3386369c79f37e060c098eed727a26cc6b08ee.zip
qemu: fix build with environment.noXlibs = true
In some tests, e.g. -f nixos/release.nix tests.simple.x86_64-linux
we use noXlibs and qemu.ga.  Now that output is tiny but to get it
a full qemu build is done, and some dependencies like gtk3 won't build
with noXlibs due to their dependencies being too stripped down.

Therefore let's reduce qemu features in noXlibs case.
The `sdlSupport = false;` part probably wasn't needed,
but I added it for consistency.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/no-x-libs.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 81c03e76d17..941ab78f863 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -36,6 +36,7 @@ with lib;
       networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
       networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
       gobject-introspection = super.gobject-introspection.override { x11Support = false; };
+      qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
     }));
   };
 }