jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #83853 from xtruder/pkgs/xpra/fixes_xorg_conf

Browse Source 
xpra: fixes for xorg.conf and use xf86videodummy from xorg
This commit is contained in:
Jaka Hudoklin 2020-04-02 03:39:09 +00:00 committed by GitHub
commit 783da8ca51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch → pkgs/tools/X11/xpra/0002-Constant-DPI.patch
View File

0
pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch → pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch
View File

0
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
View File

25
pkgs/tools/X11/xpra/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig
{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
, ffmpeg_4, x264, libvpx, libwebp, x265
@ -11,7 +11,23 @@ with lib;
let
inherit (python3.pkgs) cython buildPythonApplication;
xf86videodummy = callPackage ./xf86videodummy { };
xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: {
patches = [
./0002-Constant-DPI.patch
./0003-fix-pointer-limits.patch
./0005-support-for-30-bit-depth-in-dummy-driver.patch
];
});
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";
@ -81,6 +97,11 @@ in buildPythonApplication rec {
)
'';
# append module paths to xorg.conf
postInstall = ''
cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
'';
doCheck = false;
enableParallelBuilding = true;

31
pkgs/tools/X11/xpra/xf86videodummy/default.nix
View File

@ -1,31 +0,0 @@
{ stdenv, lib, fetchurl
, xorgproto, xorgserver
, pkgconfig }:
with lib;
stdenv.mkDerivation rec {
version = "0.3.8";
suffix = "1";
name = "xpra-xf86videodummy-${version}-${suffix}";
builder = ../../../../servers/x11/xorg/builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-dummy-${version}.tar.bz2";
sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip";
};
patches = [
./0002-Constant-DPI.patch
./0003-fix-pointer-limits.patch
./0005-support-for-30-bit-depth-in-dummy-driver.patch
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ xorgproto xorgserver ];
meta = {
description = "Dummy driver for Xorg with xpra patches";
homepage = https://xpra.org/trac/wiki/Xdummy;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ numinit ];
};
}