@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig
1+{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
22, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
33, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
44, ffmpeg_4, x264, libvpx, libwebp, x265
@@ -11,7 +11,23 @@ with lib;
1111let
1212 inherit (python3.pkgs) cython buildPythonApplication;
1313
14− xf86videodummy = callPackage ./xf86videodummy { };
14+ xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: {
15+ patches = [
16+ ./0002-Constant-DPI.patch
17+ ./0003-fix-pointer-limits.patch
18+ ./0005-support-for-30-bit-depth-in-dummy-driver.patch
19+ ];
20+ });
21+
22+ xorgModulePaths = writeText "module-paths" ''
23+ Section "Files"
24+ ModulePath "${xorgserver}/lib/xorg/modules"
25+ ModulePath "${xorgserver}/lib/xorg/modules/extensions"
26+ ModulePath "${xorgserver}/lib/xorg/modules/drivers"
27+ ModulePath "${xf86videodummy}/lib/xorg/modules/drivers"
28+ EndSection
29+ '';
30+
1531in buildPythonApplication rec {
1632 pname = "xpra";
1733 version = "3.0.7";
@@ -81,6 +97,11 @@ in buildPythonApplication rec {
8197 )
8298 '';
8399
100+ # append module paths to xorg.conf
101+ postInstall = ''
102+ cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
103+ '';
104+
84105 doCheck = false;
85106
86107 enableParallelBuilding = true;