···

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
with lib;

     

       
11
       
11
       
 
       


     

       
12
       
12
       
-
       
let

     

       
13
       
13
       
-
       


     

       
14
       
14
       
-
       
  # Wrap Xvfb to set some flags/variables.

     

       
15
       
15
       
-
       
  xvfbWrapper = pkgs.writeScriptBin "Xvfb"

     

       
16
       
16
       
-
       
    ''

     

       
17
       
17
       
-
       
      #! ${pkgs.stdenv.shell}

     

       
18
       
18
       
-
       
      export XKB_BINDIR=${pkgs.xorg.xkbcomp}/bin

     

       
19
       
19
       
-
       
      export XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri

     

       
20
       
20
       
-
       
      exec ${pkgs.xorg.xorgserver}/bin/Xvfb "$@" -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb

     

       
21
       
21
       
-
       
    '';

     

       
22
       
22
       
-
       


     

       
23
       
23
       
-
       
in

     

       
24
       
24
       
-
       


     

       
25
       
12
       
 
       
{

     

       
26
       
13
       
 
       


     

       
27
       
14
       
 
       
  config = {

     
···

       
54
       
41
       
 
       
      { description = "Terminal Server";

     

       
55
       
42
       
 
       


     

       
56
       
43
       
 
       
        path =

     

       
57
       
57
       
-
       
          [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth

     

       
44
       
44
       
+
       
          [ pkgs.xorgserver pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth

     

       
58
       
45
       
 
       
            pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash

     

       
59
       
46
       
 
       
          ];

     

       
60
       
47
       
 
       


     

···

       
325
       
325
       
 
       
          wrapProgram $out/bin/Xephyr \

     

       
326
       
326
       
 
       
            --set XKB_BINDIR "${xorg.xkbcomp}/bin" \

     

       
327
       
327
       
 
       
            --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"

     

       
328
       
328
       
+
       
          wrapProgram $out/bin/Xvfb \

     

       
329
       
329
       
+
       
            --set XKB_BINDIR "${xorg.xkbcomp}/bin" \

     

       
330
       
330
       
+
       
            --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \

     

       
331
       
331
       
+
       
            --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"

     

       
328
       
332
       
 
       
        '';

     

       
329
       
333
       
 
       
        passthru.version = version; # needed by virtualbox guest additions

     

       
330
       
334
       
 
       
      } else {

     

···

       
33
       
33
       
 
       
    pillow pygtk pygobject

     

       
34
       
34
       
 
       
  ];

     

       
35
       
35
       
 
       


     

       
36
       
36
       
-
       
  postPatch = ''

     

       
37
       
37
       
-
       
    sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py

     

       
38
       
38
       
-
       
  '';

     

       
39
       
39
       
-
       


     

       
40
       
36
       
 
       
  preBuild = ''

     

       
41
       
37
       
 
       
    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"

     

       
42
       
38
       
 
       
  '';

     

···

       
33
       
33
       
 
       
    pygobject3 pycairo cython

     

       
34
       
34
       
 
       
  ];

     

       
35
       
35
       
 
       


     

       
36
       
36
       
-
       
  postPatch = ''

     

       
37
       
37
       
-
       
    sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py

     

       
38
       
38
       
-
       
  '';

     

       
39
       
39
       
-
       


     

       
40
       
36
       
 
       
  preBuild = ''

     

       
41
       
37
       
 
       
    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)"

     

       
42
       
38
       
 
       
  '';