diff options
| author | Domen Kožar <domen@dev.si> | 2016-01-17 21:14:49 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-01-17 21:14:49 +0100 |
| commit | 9e8eba48ab46ecff67dfb27571b9adb0e2602f15 (patch) | |
| tree | 85230857fc3841313188c657cb1390c3ddc8d061 /nixos | |
| parent | 4a0692a5fb9dc38b49deeda174c37a0864e052f3 (diff) | |
| download | nixpkgs-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar nixpkgs-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.gz nixpkgs-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.bz2 nixpkgs-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.lz nixpkgs-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.xz nixpkgs-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.tar.zst nixpkgs-9e8eba48ab46ecff67dfb27571b9adb0e2602f15.zip | |
xorg.xorgserver: wrap Xvfb with required flags
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/terminal-server.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index a036e085b0b..4d5dbd60415 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -9,19 +9,6 @@ with lib; -let - - # Wrap Xvfb to set some flags/variables. - xvfbWrapper = pkgs.writeScriptBin "Xvfb" - '' - #! ${pkgs.stdenv.shell} - export XKB_BINDIR=${pkgs.xorg.xkbcomp}/bin - export XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri - exec ${pkgs.xorg.xorgserver}/bin/Xvfb "$@" -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb - ''; - -in - { config = { @@ -54,7 +41,7 @@ in { description = "Terminal Server"; path = - [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth + [ pkgs.xorgserver pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash ]; |