diff options
| author | lassulus <lassulus@lassul.us> | 2017-11-02 17:06:31 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-11-07 23:01:59 +0100 |
| commit | 4531ec59551fa3f3c9dfb442dff2ec669c467922 (patch) | |
| tree | e9c0ae3c1f2b02e024865fa709b0703966808d7e /nixos/modules/testing | |
| parent | a41342ba584db4765807492ee4c8bb2c8aa2dcd0 (diff) | |
nixos/test-instrumentation: softcode DISPLAY
Diffstat (limited to 'nixos/modules/testing')
| -rw-r--r-- | nixos/modules/testing/test-instrumentation.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 7f5b55d5cca09..2465e99e9c16e 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -5,9 +5,10 @@ with lib; -let kernel = config.boot.kernelPackages.kernel; in - -{ +let + display = (d: if d == null then 0 else d) config.services.xserver.display; + 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 @@ -28,7 +29,7 @@ let kernel = config.boot.kernelPackages.kernel; in '' export USER=root export HOME=/root - export DISPLAY=:0.0 + export DISPLAY=:${toString display} source /etc/profile |