pyrox.dev / nixpkgs
lol
fork atom

xorg.xorgserver: wrap Xvfb with required flags

Domen Kožar 9e8eba48 4a0692a5

+5 -22
unified split
+1 -14
nixos/modules/services/x11/terminal-server.nix
··· 9 10 with lib; 11 12 - let 13 - 14 - # Wrap Xvfb to set some flags/variables. 15 - xvfbWrapper = pkgs.writeScriptBin "Xvfb" 16 - '' 17 - #! ${pkgs.stdenv.shell} 18 - export XKB_BINDIR=${pkgs.xorg.xkbcomp}/bin 19 - export XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri 20 - exec ${pkgs.xorg.xorgserver}/bin/Xvfb "$@" -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb 21 - ''; 22 - 23 - in 24 - 25 { 26 27 config = { ··· 54 { description = "Terminal Server"; 55 56 path = 57 - [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth 58 pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash 59 ]; 60
··· 9 10 with lib; 11 12 { 13 14 config = { ··· 41 { description = "Terminal Server"; 42 43 path = 44 + [ pkgs.xorgserver pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth 45 pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash 46 ]; 47
+4
pkgs/servers/x11/xorg/overrides.nix
··· 325 wrapProgram $out/bin/Xephyr \ 326 --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ 327 --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" 328 ''; 329 passthru.version = version; # needed by virtualbox guest additions 330 } else {
··· 325 wrapProgram $out/bin/Xephyr \ 326 --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ 327 --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" 328 + wrapProgram $out/bin/Xvfb \ 329 + --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ 330 + --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \ 331 + --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" 332 ''; 333 passthru.version = version; # needed by virtualbox guest additions 334 } else {
-4
pkgs/tools/X11/xpra/default.nix
··· 33 pillow pygtk pygobject 34 ]; 35 36 - postPatch = '' 37 - sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py 38 - ''; 39 - 40 preBuild = '' 41 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" 42 '';
··· 33 pillow pygtk pygobject 34 ]; 35 36 preBuild = '' 37 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" 38 '';
-4
pkgs/tools/X11/xpra/gtk3.nix
··· 33 pygobject3 pycairo cython 34 ]; 35 36 - postPatch = '' 37 - sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py 38 - ''; 39 - 40 preBuild = '' 41 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" 42 '';
··· 33 pygobject3 pycairo cython 34 ]; 35 36 preBuild = '' 37 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" 38 '';