git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #83853 from xtruder/pkgs/xpra/fixes_xorg_conf

xpra: fixes for xorg.conf and use xf86videodummy from xorg

commit783da8ca5106cc81fd24c746e1b0009a82faba86 authorJaka Hudoklin <offlinehacker@users.noreply.github.com> dateThu 2 Apr 2020, 03:39 (7 years ago) parent820cc39439d97e
5 files changed+23−33
pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch → pkgs/tools/X11/xpra/0002-Constant-DPI.patch pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch → pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch → pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch pkgs/tools/X11/xpra/default.nix+23−2 pkgs/tools/X11/xpra/xf86videodummy/default.nix−31
pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch → pkgs/tools/X11/xpra/0002-Constant-DPI.patchrenamed

The content is the same.

pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch → pkgs/tools/X11/xpra/0003-fix-pointer-limits.patchrenamed

The content is the same.

pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch → pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patchrenamed

The content is the same.

pkgs/tools/X11/xpra/default.nix+23−2
@@ -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;
pkgs/tools/X11/xpra/xf86videodummy/default.nixdeleted−31
@@ -1,31 +0,0 @@
1−{ stdenv, lib, fetchurl
2−, xorgproto, xorgserver
3−, pkgconfig }:
4−
5−with lib;
6−
7−stdenv.mkDerivation rec {
8− version = "0.3.8";
9− suffix = "1";
10− name = "xpra-xf86videodummy-${version}-${suffix}";
11− builder = ../../../../servers/x11/xorg/builder.sh;
12− src = fetchurl {
13− url = "mirror://xorg/individual/driver/xf86-video-dummy-${version}.tar.bz2";
14− sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip";
15− };
16− patches = [
17− ./0002-Constant-DPI.patch
18− ./0003-fix-pointer-limits.patch
19− ./0005-support-for-30-bit-depth-in-dummy-driver.patch
20− ];
21− nativeBuildInputs = [ pkgconfig ];
22− buildInputs = [ xorgproto xorgserver ];
23−
24− meta = {
25− description = "Dummy driver for Xorg with xpra patches";
26− homepage = https://xpra.org/trac/wiki/Xdummy;
27− license = licenses.gpl2;
28− platforms = platforms.unix;
29− maintainers = with maintainers; [ numinit ];
30− };
31−}