diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 09:48:49 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 09:48:49 +0100 |
| commit | 620c147ccee09d7d068fa21b2b5b94b6695993a5 (patch) | |
| tree | 8bfa9b076f2712ba0318c986dcf80749e281db2d /pkgs/servers/x11 | |
| parent | 85628148de308b96744986f44ef0d05807125082 (diff) | |
| parent | c23b0856fda476df6aa58bcded9de6bdbeefdaed (diff) | |
| download | nixlib-620c147ccee09d7d068fa21b2b5b94b6695993a5.tar nixlib-620c147ccee09d7d068fa21b2b5b94b6695993a5.tar.gz nixlib-620c147ccee09d7d068fa21b2b5b94b6695993a5.tar.bz2 nixlib-620c147ccee09d7d068fa21b2b5b94b6695993a5.tar.lz nixlib-620c147ccee09d7d068fa21b2b5b94b6695993a5.tar.xz nixlib-620c147ccee09d7d068fa21b2b5b94b6695993a5.tar.zst nixlib-620c147ccee09d7d068fa21b2b5b94b6695993a5.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d6e18254760f..7bd179067cd0 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 { |