xpra: use xf86videodummy from xorg

This commit is contained in:
Jaka Hudoklin 2020-03-31 13:29:46 +07:00
parent 1504df58e2
commit af418c4356
5 changed files with 9 additions and 33 deletions

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,14 @@ 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
];
});
in buildPythonApplication rec {
pname = "xpra";
version = "3.0.7";

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 ];
};
}