treewide/xorg: replace *proto with xorgproto

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
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, writeText
, xproto, libX11, libXext, libXrandr
, xorgproto, libX11, libXext, libXrandr
# default header can be obtained from
# https://git.suckless.org/slock/tree/config.def.h
, conf ? null }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m";
};
buildInputs = [ xproto libX11 libXext libXrandr ];
buildInputs = [ xorgproto libX11 libXext libXrandr ];
installFlags = "DESTDIR=\${out} PREFIX=";
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, xlibsWrapper
, imake, gccmakedep, libXScrnSaver, scrnsaverproto }:
, imake, gccmakedep, libXScrnSaver, xorgproto }:
stdenv.mkDerivation rec {
name = "xautolock-2.2";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
installTargets = "install install.man";
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper libXScrnSaver scrnsaverproto ];
buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ];
meta = with stdenv.lib; {
description = "A program that launches a given program when your X session has been idle for a given time.";
homepage = http://www.ibiblio.org/pub/linux/X11/screensavers;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, libXext, libXt, xextproto, xproto }:
{ stdenv, fetchurl, libX11, libXext, libXt, xorgproto }:
stdenv.mkDerivation rec {
name = "xosd-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "025m7ha89q29swkc7s38knnbn8ysl24g2h5s7imfxflm91psj7sg";
};
buildInputs = [ libX11 libXext libXt xextproto xproto ];
buildInputs = [ libX11 libXext libXt xorgproto ];
meta = with stdenv.lib; {
description = "Displays text on your screen";