diff options
| author | Lengyel Balazs <ikervagyok@gmail.com> | 2018-12-31 04:40:47 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-01-04 14:38:57 +0100 |
| commit | f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9 (patch) | |
| tree | e7ce232c1bce855e2752534bd615b3a2383990a2 /pkgs/tools/X11/xpra | |
| parent | 51d6b1bdece85e0d136e91b7cead120240698a8c (diff) | |
treewide/xorg: replace *proto with xorgproto
Diffstat (limited to 'pkgs/tools/X11/xpra')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/xf86videodummy/default.nix | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index ecbd36e11625..1d6ea45c9c5e 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -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 diff --git a/pkgs/tools/X11/xpra/xf86videodummy/default.nix b/pkgs/tools/X11/xpra/xf86videodummy/default.nix index ab786d9bce84..8d04745ed7fc 100644 --- a/pkgs/tools/X11/xpra/xf86videodummy/default.nix +++ b/pkgs/tools/X11/xpra/xf86videodummy/default.nix @@ -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"; |