From 00344162a7d1a4ed438e863b99652cf298b2ad00 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Wed, 8 Nov 2017 17:03:59 +0000
Subject: Revert "nixos/test-instrumentation: softcode DISPLAY"

This reverts commit 4531ec59551fa3f3c9dfb442dff2ec669c467922.

This broke waitForX: https://github.com/NixOS/nixpkgs/commit/b11ac5d29dcccdb7474a23ac1d8a6c40553adcd5#commitcomment-25486347

cc @Lassulus
---
 nixos/modules/testing/test-instrumentation.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'nixos/modules/testing')

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
 
-- 
cgit 1.4.1