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/applications/window-managers/evilwm/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, libX11, libXext, libXrandr, libXrender,
xproto, xextproto, randrproto, renderproto, kbproto, patches ? [] }:
xorgproto, patches ? [] }:
stdenv.mkDerivation rec {
name = "evilwm-1.1.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ libX11 libXext libXrandr libXrender
xproto xextproto randrproto renderproto kbproto ];
xorgproto ];
prePatch = ''substituteInPlace ./Makefile --replace /usr $out \
--replace "CC = gcc" "#CC = gcc"'';
pkgs/applications/window-managers/fluxbox/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig
, freetype, fribidi
, libXext, libXft, libXpm, libXrandr, libXrender, xextproto
, libXext, libXft, libXpm, libXrandr, libXrender, xorgproto
, libXinerama
, imlib2 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ];
buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xorgproto libXinerama imlib2 ];
enableParallelBuilding = true;
pkgs/applications/window-managers/i3/easyfocus.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms
{ stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb, xcbutilkeysyms
, xorg , i3ipc-glib , glib
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxcb xcbutilkeysyms xproto xorg.libX11.dev i3ipc-glib glib.dev ];
buildInputs = [ libxcb xcbutilkeysyms xorgproto xorg.libX11.dev i3ipc-glib glib.dev ];
# Makefile has no rule for 'install'
installPhase = ''
pkgs/applications/window-managers/i3/i3ipc-glib.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb
{ stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb
, autoreconfHook, json-glib, gtk-doc, which
, gobject-introspection
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook which pkgconfig ];
buildInputs = [ libxcb json-glib gtk-doc xproto gobject-introspection ];
buildInputs = [ libxcb json-glib gtk-doc xorgproto gobject-introspection ];
preAutoreconf = ''
pkgs/applications/window-managers/jwm/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool,
gettext, which, xorg, libX11, libXext, libXinerama, libXpm, libXft,
libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xproto, xextproto,
xineramaproto, librsvg, freetype, fontconfig }:
libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xorgproto,
librsvg, freetype, fontconfig }:
stdenv.mkDerivation rec {
name = "jwm-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender
libXau libXdmcp libXmu libpng libjpeg expat xproto xextproto xineramaproto
libXau libXdmcp libXmu libpng libjpeg expat xorgproto
librsvg freetype fontconfig ];
enableParallelBuilding = true;
pkgs/applications/window-managers/oroborus/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, freetype, fribidi
, libSM, libICE, libXt, libXaw, libXmu
, libXext, libXft, libXpm, libXrandr
, libXrender, xextproto, libXinerama }:
, libXrender, xorgproto, libXinerama }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext
libXft libXpm libXrandr libXrender xextproto libXinerama ];
libXft libXpm libXrandr libXrender xorgproto libXinerama ];
src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
pkgs/applications/window-managers/ratpoison/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, perl, autoconf, automake
, libX11, inputproto, libXt, libXpm, libXft, libXtst, xextproto, libXi
, libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi
, libXrandr, fontconfig, freetype, readline
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ perl
libX11 inputproto libXt libXpm libXft libXtst xextproto libXi libXrandr
libX11 xorgproto libXt libXpm libXft libXtst libXi libXrandr
fontconfig freetype readline ];
postInstall = ''
pkgs/applications/window-managers/stalonetray/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, xproto }:
{ stdenv, fetchurl, libX11, xorgproto }:
stdenv.mkDerivation rec {
name = "stalonetray-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n";
};
buildInputs = [ libX11 xproto ];
buildInputs = [ libX11 xorgproto ];
hardeningDisable = [ "format" ];
pkgs/applications/window-managers/tabbed/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchgit, xproto, libX11, libXft, customConfig ? null, patches ? [] }:
{stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }:
with stdenv.lib;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
cp ${builtins.toFile "config.h" customConfig} ./config.h
'';
buildInputs = [ xproto libX11 libXft ];
buildInputs = [ xorgproto libX11 libXft ];
makeFlags = [
"PREFIX=$(out)"