summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/X11/xpra
diff options
context:
space:
mode:
authorJaka Hudoklin <jaka@x-truder.net>2020-03-31 13:30:26 +0700
committerJaka Hudoklin <jaka@x-truder.net>2020-03-31 13:30:26 +0700
commit439d97eb97dac18987a31dab967b8ad88575f085 (patch)
treee84de1fc11675b594bf18fdbd2b7e4ce724df592 /pkgs/tools/X11/xpra
parentaf418c43569ec527a1f58834204d0b9b2f1ba0d4 (diff)
xpra: set correct module paths for xorg.conf
Diffstat (limited to 'pkgs/tools/X11/xpra')
-rw-r--r--pkgs/tools/X11/xpra/default.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 69b3e51280cb..968c695c464a 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -19,6 +19,15 @@ let
];
});
+ xorgModulePaths = writeText "module-paths" ''
+ Section "Files"
+ ModulePath "${xorgserver}/lib/xorg/modules"
+ ModulePath "${xorgserver}/lib/xorg/modules/extensions"
+ ModulePath "${xorgserver}/lib/xorg/modules/drivers"
+ ModulePath "${xf86videodummy}/lib/xorg/modules/drivers"
+ EndSection
+ '';
+
in buildPythonApplication rec {
pname = "xpra";
version = "3.0.7";
@@ -88,6 +97,11 @@ in buildPythonApplication rec {
)
'';
+ # append module paths to xorg.conf
+ postInstall = ''
+ cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
+ '';
+
doCheck = false;
enableParallelBuilding = true;