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 | |
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
-rw-r--r-- | nixos/modules/services/x11/terminal-server.nix | 15 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/gtk3.nix | 4 |
4 files changed, 5 insertions, 22 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 ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d6e18254760..7bd179067cd 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -325,6 +325,10 @@ in wrapProgram $out/bin/Xephyr \ --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" + wrapProgram $out/bin/Xvfb \ + --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ + --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \ + --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" ''; passthru.version = version; # needed by virtualbox guest additions } else { diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b1fdd96adb5..c5b8db591c4 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -33,10 +33,6 @@ buildPythonPackage rec { pillow pygtk pygobject ]; - postPatch = '' - sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py - ''; - preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" ''; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 04bcd119514..6e485dc0a05 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -33,10 +33,6 @@ buildPythonPackage rec { pygobject3 pycairo cython ]; - postPatch = '' - sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py - ''; - preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" ''; |