summaryrefslogtreecommitdiffstats
path: root/nixos/modules/testing
diff options
context:
space:
mode:
authorJoerg Thalheim <joerg@thalheim.io>2017-11-08 17:03:59 +0000
committerJoerg Thalheim <joerg@thalheim.io>2017-11-08 17:04:39 +0000
commit00344162a7d1a4ed438e863b99652cf298b2ad00 (patch)
tree3bddb34d21683be0d6c630a6503608b3bacdd8b1 /nixos/modules/testing
parentf162d54b7602a620f288309bc5d9c832069140b4 (diff)
Revert "nixos/test-instrumentation: softcode DISPLAY"
This reverts commit 4531ec59551fa3f3c9dfb442dff2ec669c467922. This broke waitForX: https://github.com/NixOS/nixpkgs/commit/b11ac5d29dcccdb7474a23ac1d8a6c40553adcd5#commitcomment-25486347 cc @Lassulus
Diffstat (limited to 'nixos/modules/testing')
-rw-r--r--nixos/modules/testing/test-instrumentation.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 2465e99e9c16..7f5b55d5cca0 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -5,10 +5,9 @@
with lib;
-let
- display = (d: if d == null then 0 else d) config.services.xserver.display;
- kernel = config.boot.kernelPackages.kernel;
-in {
+let kernel = config.boot.kernelPackages.kernel; in
+
+{
# This option is a dummy that if used in conjunction with
# modules/virtualisation/qemu-vm.nix gets merged with the same option defined
@@ -29,7 +28,7 @@ in {
''
export USER=root
export HOME=/root
- export DISPLAY=:${toString display}
+ export DISPLAY=:0.0
source /etc/profile