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

treewide/xorg: replace *proto with xorgproto

Browse Source
This commit is contained in:
Lengyel Balazs
2019-01-04 14:38:57 +01:00
committed by Robin Gloster
parent 51d6b1bdec
commit f4a53ff3bc
133 changed files with 348 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/X11/xpra/default.nix
+5 -6
View File
@@ -29,14 +29,13 @@ in buildPythonApplication rec {
];
nativeBuildInputs = [ pkgconfig gobject-introspection wrapGAppsHook ];
buildInputs = [
buildInputs = with xorg; [
libX11 xorgproto libXrender libXi
libXtst libXfixes libXcomposite libXdamage
libXrandr libxkbfile
] ++ [
cython
xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
xorg.libXrandr xorg.libxkbfile
pango cairo gdk_pixbuf atk gtk3 glib
ffmpeg libvpx x264 libwebp
pkgs/tools/X11/xpra/xf86videodummy/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl
, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto
, xorgproto, xorgserver
, pkgconfig
, xpra }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
./0005-support-for-30-bit-depth-in-dummy-driver.patch
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
buildInputs = [ xorgproto xorgserver ];
meta = {
description = "Dummy driver for Xorg with xpra patches";