Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 820cc39ad4db
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 783da8ca5106
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Mar 31, 2020

  1. xpra: use xf86videodummy from xorg

    @offlinehacker
    offlinehacker committed Mar 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    af418c4 View commit details

  2. xpra: set correct module paths for xorg.conf

    @offlinehacker
    offlinehacker committed Mar 31, 2020
    Copy the full SHA
    439d97e View commit details

Commits on Apr 2, 2020

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

    xpra: fixes for xorg.conf and use xf86videodummy from xorg
    @offlinehacker
    offlinehacker authored Apr 2, 2020
    Copy the full SHA
    783da8c View commit details
0 ...ra/xf86videodummy/0002-Constant-DPI.patch → pkgs/tools/X11/xpra/0002-Constant-DPI.patch
View file
File renamed without changes.
0 ...6videodummy/0003-fix-pointer-limits.patch → ...ls/X11/xpra/0003-fix-pointer-limits.patch
View file
File renamed without changes.
0 ...rt-for-30-bit-depth-in-dummy-driver.patch → ...rt-for-30-bit-depth-in-dummy-driver.patch
View file
File renamed without changes.
25 changes: 23 additions & 2 deletions pkgs/tools/X11/xpra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 31 deletions pkgs/tools/X11/xpra/xf86videodummy/default.nix
View file

This file was deleted.