treewide/xorg: replace *proto with xorgproto

This commit is contained in:
Lengyel Balazs 2018-12-31 04:40:47 +01:00 committed by Robin Gloster
parent 51d6b1bdec
commit f4a53ff3bc
133 changed files with 348 additions and 367 deletions

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext
xorg.xproto
xorg.xorgproto
];
patchPhase = "sed -i '41,43d' libbristolaudio/audioEngineJack.c"; # disable alsa/iatomic

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, xorg, xproto, cairo, lv2, pkgconfig }:
{ stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
xorg.libX11 xproto cairo lv2
xorg.libX11 xorgproto cairo lv2
];
installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xextproto }:
{ stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xorgproto }:
stdenv.mkDerivation rec {
name = "mid2key-r1";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
unpackPhase = "tar xvzf $src";
buildInputs = [ alsaLib libX11 libXi libXtst xextproto ];
buildInputs = [ alsaLib libX11 libXi libXtst xorgproto ];
buildPhase = "make";

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms,
flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11,
pythonPackages, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
glib, makedepend, xorgproto, libXmu, openexr,
libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
let
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
libexif zlib libX11 python pygtk gettext intltool babl
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined
gegl glib makedepend xorgproto libXmu openexr libGLU_combined
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
] ++ (with perlPackages; [ perl XMLParser ]);

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, aalib, gsl, libpng, libX11, xproto, libXext
, xextproto, libXt, zlib, gettext, intltool, perl }:
{ stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext
, libXt, zlib, gettext, intltool, perl }:
stdenv.mkDerivation rec {
name = "xaos-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [
aalib gsl libpng libX11 xproto libXext xextproto
aalib gsl libpng libX11 xorgproto libXext
libXt zlib gettext intltool perl
];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem
, ghostscript, atk, gtk2, glib, fontconfig, freetype
, libgnomecanvas, libgnomeprint, libgnomeprintui
, pango, libX11, xproto, zlib, poppler
, pango, libX11, xorgproto, zlib, poppler
, autoconf, automake, libtool, pkgconfig}:
let
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ghostscript atk gtk2 glib fontconfig freetype
libgnomecanvas
pango libX11 xproto zlib poppler
pango libX11 xorgproto zlib poppler
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
libgnomeprint libgnomeprintui
];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper
, pkgconfig, which, perl, libXrandr
, cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg, dunstify ? false
, libXinerama, libnotify, libxdg_basedir, pango, xorgproto, librsvg, dunstify ? false
}:
stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
libXinerama libnotify libxdg_basedir pango xproto librsvg libXrandr
libXinerama libnotify libxdg_basedir pango xorgproto librsvg libXrandr
];
outputs = [ "out" "man" ];

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11
xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig
xorg.xorgproto xorg.libXext makeWrapper pkgconfig
];
buildPhase = ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xextproto, libXtst }:
{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
stdenv.mkDerivation rec {
name = "keepassx-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
patches = [ ./random.patch ];
buildInputs = [ bzip2 qt4 libX11 xextproto libXtst ];
buildInputs = [ bzip2 qt4 libX11 xorgproto libXtst ];
nativeBuildInputs = [ qmake4Hook ];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, libXft, libXi, inputproto, libSM, libICE
{ stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE
, freetype, pkgconfig, which }:
stdenv.mkDerivation {
name = "mrxvt-0.5.4";
buildInputs =
[ libX11 libXft libXi inputproto libSM libICE freetype pkgconfig which ];
[ libX11 libXft libXi xorgproto libSM libICE freetype pkgconfig which ];
configureFlags = [
"--with-x"

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl
, wxGTK31, libXi, libXt, libXtst, xercesc, xextproto
, wxGTK31, libXi, libXt, libXtst, xercesc, xorgproto
, qrencode, libuuid, libyubikey, yubikey-personalization
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig zip ];
buildInputs = [
gettext perl qrencode libuuid
libXi libXt libXtst wxGTK31 xercesc xextproto
libXi libXt libXtst wxGTK31 xercesc xorgproto
libyubikey yubikey-personalization
];
cmakeFlags = [

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto
, xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, autoreconfHook
{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xorgproto
, xinput, libXi, libXext, libXtst, libXpm, libX11, autoreconfHook
}:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [
freetype libXrender libXft libXext libXtst libXpm libX11
libXi xextproto xinput xproto
libXi xorgproto xinput
];
nativeBuildInputs = [ autoreconfHook ];

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
[ xorg.libXaw xorg.xorgproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper
];

View file

@ -92,8 +92,8 @@ stdenv.mkDerivation rec {
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
xorg.libXScrnSaver xorg.xorgproto
xorg.libXext sqlite unzip makeWrapper
libevent libstartup_notification libvpx /* cairo */
icu libpng jemalloc glib
]

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, firefox, libX11, xproto }:
{ stdenv, fetchurl, firefox, libX11, xorgproto }:
stdenv.mkDerivation rec {
name = "mozplugger-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1vszkq4kdbaxsrqr2xn9rq6ipza9fngdri79gvjqk3bvsdmg0k19";
};
buildInputs = [ firefox libX11 xproto ];
buildInputs = [ firefox libX11 xorgproto ];
installPhase = ''
mkdir -p "$out/etc" "$out/bin" "$out/lib/mozilla/plugins" "$out/share/man/man7"

View file

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
libpulseaudio sqlite unzip which yasm zip zlib
] ++ (with xorg; [
libX11 libXext libXft libXi libXrender libXScrnSaver
libXt pixman scrnsaverproto xextproto
libXt pixman xorgproto
]);
enableParallelBuilding = true;

View file

@ -1,8 +1,8 @@
{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib
, libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
, libsigcxx, gtk, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret
, pkgconfig, libxml2, unixODBC, db, nspr, nss, zlib
, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
stdenv.mkDerivation rec {
name = "ekiga-4.0.1";
@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
evolution-data-server gnome-doc-utils avahi
libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite
libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite
gnome3.libsoup glib gnome3.defaultIconTheme boost
autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
nss zlib libsecret libXrandr randrproto which libxslt libtasn1
autoreconfHook pkgconfig libxml2 unixODBC db nspr
nss zlib libsecret libXrandr which libxslt libtasn1
gmp nettle makeWrapper ]
++ (with perlPackages; [ perl XMLParser ]);

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM
{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xorgproto, libSM
, libICE, qca2, pkgconfig, which, glib
, libXScrnSaver, scrnsaverproto
, libXScrnSaver
}:
stdenv.mkDerivation rec {
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ enchant qt4 zlib sox libX11 xproto libSM libICE
qca2 pkgconfig which glib scrnsaverproto libXScrnSaver
[ enchant qt4 zlib sox libX11 xorgproto libSM libICE
qca2 pkgconfig which glib libXScrnSaver
];
NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, qt4, qmake4Hook, openssl
, xproto, libX11, libXScrnSaver, scrnsaverproto
, xorgproto, libX11, libXScrnSaver
, xz, zlib
}:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz zlib
qt4 openssl xorgproto libX11 libXScrnSaver xz zlib
];
# hack: needed to fix build issues in

View file

@ -37,8 +37,8 @@ in stdenv.mkDerivation rec {
dbus dbus-glib pango freetype fontconfig xorg.libXi
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
nspr nss libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip
xorg.libXScrnSaver xorg.xorgproto
xorg.libXext sqlite unzip
hunspell libevent libstartup_notification /* cairo */
icu libpng jemalloc
]

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl
, xproto, motif, libX11, libXt, libXpm, bison
, xorgproto, motif, libX11, libXt, libXpm, bison
, flex, automake, autoconf, libtool
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libtool automake autoconf flex ];
buildInputs = [ xproto motif xproto libX11 libXt libXpm bison ];
buildInputs = [ xorgproto motif libX11 libXt libXpm bison ];
sourceRoot = "alliance/src/";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }:
{ stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xorgproto, gccmakedep }:
let
libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ which yacc flex imake gccmakedep ];
buildInputs = [ tcl tk libX11 xproto ];
buildInputs = [ tcl tk libX11 xorgproto ];
dontUseImakeConfigure = true;
patchPhase = ''

View file

@ -2,7 +2,7 @@
, pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
, libtiff, freetype, mjpegtools, x264, gettext, openexr
, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xextproto, libtheora, libpng
, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng
, libdv, libuuid, file, nasm, perl
, fontconfig, intltool }:
@ -30,7 +30,7 @@ stdenv.mkDerivation {
a52dec alsaLib fftw lame libavc1394 libiec61883
libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
mjpegtools x264 gettext openexr
libXext libXxf86vm libXv libXi libX11 libXft xextproto
libXext libXxf86vm libXv libXi libX11 libXft xorgproto
libtheora libpng libdv libuuid
nasm
perl

View file

@ -4,10 +4,10 @@
, boost, avahi, lame, autoreconfHook
, gettext, pcre-cpp, yajl, fribidi, which
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
, libX11, xproto, inputproto, libxml2
, libXt, libXmu, libXext, xextproto
, libXinerama, libXrandr, randrproto
, libXtst, libXfixes, fixesproto, systemd
, libX11, xorgproto, libxml2
, libXt, libXmu, libXext
, libXinerama, libXrandr
, libXtst, libXfixes, systemd
, alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl
, libjpeg, jasper, libpng, libtiff
, libmpeg2, libsamplerate, libmad
@ -123,8 +123,8 @@ in stdenv.mkDerivation rec {
boost libmicrohttpd
gettext pcre-cpp yajl fribidi libva libdrm
openssl gperf tinyxml2 taglib libssh swig jre
libX11 xproto inputproto libXt libXmu libXext xextproto
libXinerama libXrandr randrproto libXtst libXfixes fixesproto
libX11 xorgproto libXt libXmu libXext
libXinerama libXrandr libXtst libXfixes
alsaLib libGLU_combined glew fontconfig freetype ftgl
libjpeg jasper libpng libtiff wayland
libmpeg2 libsamplerate libmad

View file

@ -1,5 +1,5 @@
{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xproto, libv4l
, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}:
{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xorgproto, libv4l
, libFS, libXaw, libXpm, libXext, libSM, libICE, perl, linux}:
stdenv.mkDerivation rec {
name = "xawtv-3.105";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX=";
buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS perl alsaLib aalib
fontsproto libXaw libXpm libXext libSM libICE xextproto libv4l];
buildInputs = [ncurses libjpeg libX11 libXt libXft xorgproto libFS perl alsaLib aalib
libXaw libXpm libXext libSM libICE libv4l];
meta = {
description = "TV application for Linux with apps and tools such as a teletext browser";

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ xineLib libpng readline ncurses curl lirc libjpeg
xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto
xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.xorgproto
xorg.libXinerama xorg.libXi xorg.libXft
];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
, libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
, libpng, glib, lvm2, libXrandr, libXinerama, libopus
, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
, alsaLib, curl, libvpx, nettools, dbus
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ];
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
[ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
libcap glib lvm2 alsaLib curl libvpx pam makeself perl
libXmu libpng libopus python ]
++ optional javaBindings jdk

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"'';

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;

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 = ''

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 = ''

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;

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";

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 = ''

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" ];

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)"

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, xproto}:
{stdenv, fetchurl, pkgconfig, xorgproto}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "rgb";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [pkgconfig];
buildInputs = [xproto];
buildInputs = [xorgproto];
meta = {
inherit version;
description = "X11 colorname to RGB mapping database";

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu
giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.xorgproto
xorg.libX11 udev systemd ];
propagatedBuildInputs = [ libxkbcommon python27Packages.dbus-python dbus libjpeg xorg.libXcomposite

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }:
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ];
buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

View file

@ -2,7 +2,7 @@
stdenv, fetchurl
, fpc
, gtk2, glib, pango, atk, gdk_pixbuf
, libXi, inputproto, libX11, xproto, libXext, xextproto
, libXi, xorgproto, libX11, libXext
, makeWrapper
}:
let
@ -15,8 +15,8 @@ let
name = "lazarus-${version}";
};
buildInputs = [
fpc gtk2 glib libXi inputproto
libX11 xproto libXext xextproto pango atk
fpc gtk2 glib libXi xorgproto
libX11 libXext pango atk
stdenv.cc makeWrapper gdk_pixbuf
];
in

View file

@ -16,8 +16,8 @@
, zip ? null, unzip ? null, pkgconfig ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
, libXrender ? null, xorgproto ? null
, libXrandr ? null, libXi ? null
, x11Support ? langJava
, enableMultilib ? false
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
@ -89,7 +89,7 @@ let version = "4.8.5";
xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
xorgproto
];
javaAwtGtk = langJava && x11Support;

View file

@ -16,8 +16,8 @@
, zip ? null, unzip ? null, pkgconfig ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
, libXrender ? null, xorgproto ? null
, libXrandr ? null, libXi ? null
, x11Support ? langJava
, enableMultilib ? false
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
@ -94,7 +94,7 @@ let version = "4.9.4";
xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
xorgproto
];
javaAwtGtk = langJava && x11Support;

View file

@ -16,8 +16,8 @@
, zip ? null, unzip ? null, pkgconfig ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
, libXrender ? null, xorgproto ? null
, libXrandr ? null, libXi ? null
, x11Support ? langJava
, enableMultilib ? false
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
@ -81,7 +81,7 @@ let version = "5.5.0";
xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
xorgproto
];
javaAwtGtk = langJava && x11Support;

View file

@ -16,8 +16,8 @@
, zip ? null, unzip ? null, pkgconfig ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
, libXrender ? null, xorgproto ? null
, libXrandr ? null, libXi ? null
, x11Support ? langJava
, enableMultilib ? false
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
@ -78,7 +78,7 @@ let version = "6.5.0";
xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
xorgproto
];
javaAwtGtk = langJava && x11Support;

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which
, texinfo, libX11, xproto, inputproto, libXi, gmp, readline, strace
, libXext, xextproto, libXt, libXaw, libXmu } :
, texinfo, libX11, xorgproto, libXi, gmp, readline, strace
, libXext, libXt, libXaw, libXmu } :
assert stdenv ? cc ;
assert stdenv.cc.isGNU ;
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
buildInputs = [
mpfr m4 binutils emacs gmp
libX11 xproto inputproto libXi
libXext xextproto libXt libXaw libXmu
libX11 xorgproto libXi
libXext libXt libXaw libXmu
zlib which texinfo readline strace
];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which
, texinfo, libX11, xproto, inputproto, libXi, gmp
, libXext, xextproto, libXt, libXaw, libXmu } :
, texinfo, libX11, xorgproto, libXi, gmp
, libXext, libXt, libXaw, libXmu } :
assert stdenv ? cc ;
assert stdenv.cc.isGNU ;
@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
buildInputs = [
mpfr m4 binutils emacs gmp
libX11 xproto inputproto libXi
libXext xextproto libXt libXaw libXmu
libX11 xorgproto libXi
libXext libXt libXaw libXmu
zlib which texinfo
];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl
, ncurses
, libX11, xproto, buildEnv
, libX11, xorgproto, buildEnv
}:
let
useX11 = stdenv.isi686 || stdenv.isx86_64;
x11deps = [ libX11 xproto ];
x11deps = [ libX11 xorgproto ];
inherit (stdenv.lib) optionals;
baseOcamlBranch = "4.07";

View file

@ -11,7 +11,7 @@ let
in
{ stdenv, fetchurl, ncurses, buildEnv
, libX11, xproto, useX11 ? safeX11 stdenv
, libX11, xorgproto, useX11 ? safeX11 stdenv
, flambdaSupport ? false
}:
@ -25,7 +25,7 @@ let
in
let
x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
x11env = buildEnv { name = "x11env"; paths = [libX11 xorgproto]; };
x11lib = x11env + "/lib";
x11inc = x11env + "/include";
in
@ -48,7 +48,7 @@ stdenv.mkDerivation (args // rec {
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses
++ optionals useX11 [ libX11 xproto ];
++ optionals useX11 [ libX11 xorgproto ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat)

View file

@ -4,7 +4,7 @@
# by default
# - full: contains base plus modules in withModules
{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
, libffi
, libffcall
, coreutils
@ -21,7 +21,7 @@
}:
assert x11Support -> (libX11 != null && libXau != null && libXt != null
&& libXpm != null && xproto != null && libXext != null && xextproto != null);
&& libXpm != null && xorgproto != null && libXext != null);
stdenv.mkDerivation rec {
v = "2.49";
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
++ stdenv.lib.optional ffcallAvailable libffcall
++ stdenv.lib.optionals x11Support [
libX11 libXau libXt libXpm xproto libXext xextproto
libX11 libXau libXt libXpm xorgproto libXext
];
patches = [

View file

@ -4,7 +4,7 @@
# by default
# - full: contains base plus modules in withModules
{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
, libffi, libffcall, automake
, coreutils
# build options
@ -20,7 +20,7 @@
}:
assert x11Support -> (libX11 != null && libXau != null && libXt != null
&& libXpm != null && xproto != null && libXext != null && xextproto != null);
&& libXpm != null && xorgproto != null && libXext != null);
stdenv.mkDerivation rec {
v = "2.50pre20171114";
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
++ stdenv.lib.optional ffcallAvailable libffcall
++ stdenv.lib.optionals x11Support [
libX11 libXau libXt libXpm xproto libXext xextproto
libX11 libXau libXt libXpm xorgproto libXext
];
# First, replace port 9090 (rather low, can be used)

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, libGLU_combined, SDL
{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU_combined, SDL
, blas, libbfd, intltool, gettext, zlib, libSM}:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
libX11 libSM xproto indent readline gsl freeglut libGLU_combined SDL blas libbfd
libX11 libSM xorgproto indent readline gsl freeglut libGLU_combined SDL blas libbfd
intltool gettext zlib
];

View file

@ -8,7 +8,7 @@
, openssl
, readline
, sqlite
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false
, zlib
, callPackage
, self
@ -26,7 +26,7 @@
assert x11Support -> tcl != null
&& tk != null
&& xproto != null
&& xorgproto != null
&& libX11 != null;
with stdenv.lib;
@ -53,7 +53,7 @@ let
buildInputs = filter (p: p != null) [
zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
++ optionals x11Support [ tcl tk libX11 xproto ]
++ optionals x11Support [ tcl tk libX11 xorgproto ]
++ optionals stdenv.isDarwin [ CF configd ];
hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);

View file

@ -1,7 +1,7 @@
{ stdenv, config, libGLSupported, fetchurl, pkgconfig, pruneLibtoolFiles
, openglSupport ? libGLSupported, libGL
, alsaSupport ? stdenv.isLinux, alsaLib
, x11Support ? !stdenv.isCygwin, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
, x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols, libxkbcommon
, dbusSupport ? stdenv.isLinux, dbus
, udevSupport ? false, udev
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# Propagated for #include <GLES/gl.h> in SDL_opengles.h.
++ optional openglSupport libGL
# Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h.
++ optionals x11Support [ libX11 xproto ];
++ optionals x11Support [ libX11 xorgproto ];
dlopenBuildInputs = [ ]
++ optional alsaSupport alsaLib

View file

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xextproto, libX11, xproto
{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac
, inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora
, libXxf86dga, libXxf86misc
, libXxf86vm, openal, libGLU_combined, libjpeg, flac
, libXi, libXfixes, freetype, libopus, libtheora
, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
, libXdmcp
}:
@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
};
buildInputs = [
texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
texinfo libXext xorgproto libX11 libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined
kbproto libjpeg flac
inputproto libXi fixesproto libXfixes
libXxf86vm openal libGLU_combined
libjpeg flac
libXi libXfixes
enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp
libpulseaudio libpthreadstubs
];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
{ stdenv, fetchurl, texinfo, libXext, xorgproto, libX11
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined }:
, libXxf86dga, libXxf86misc
, libXxf86vm, openal, libGLU_combined }:
stdenv.mkDerivation rec {
name = "allegro-${version}";
@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
texinfo libXext xorgproto libX11 libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined
libXxf86vm openal libGLU_combined
];
hardeningDisable = [ "format" ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xproto, inputproto
{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xorgproto
, libXi, pkgconfig }:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
unzip cmake libGLU_combined freeglut libX11 xproto inputproto libXi
unzip cmake libGLU_combined freeglut libX11 xorgproto libXi
];
cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xproto
, inputproto, libXi, libXmu
{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xorgproto
, libXi, libXmu
}:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs =
[ freeglut libGLU_combined glfw2 glew libX11 xproto inputproto libXi libXmu ];
[ freeglut libGLU_combined glfw2 glew libX11 xorgproto libXi libXmu ];
postInstall = ''
mkdir -p $out/bin

View file

@ -21,8 +21,8 @@ stdenv.mkDerivation {
buildInputs = [ zlib libjpeg freetype giflib libpng ]
++ stdenv.lib.optional enableSDL SDL
++ stdenv.lib.optionals enableX11 (with xorg; [
xproto libX11 libXext #xextproto
#renderproto libXrender
xorgproto libX11 libXext
libXrender
]);
NIX_LDFLAGS="-lgcc_s";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
, libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig
, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkgconfig
}:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM
libsamplerate libtool autoconf automake xproto libICE pkgconfig
libsamplerate libtool autoconf automake xorgproto libICE pkgconfig
];
meta = with stdenv.lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
, libtiff, freetype, cf-private, Cocoa, AGL, GLUT
}:
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
"--enable-xft"
];
propagatedBuildInputs = [ inputproto ]
propagatedBuildInputs = [ xorgproto ]
++ (if stdenv.isDarwin
then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
else [ xlibsWrapper libXi freeglut ]);

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
, libtiff, freetype, cf-private, Cocoa, AGL, GLUT
}:
@ -33,7 +33,7 @@ in stdenv.mkDerivation {
"--enable-xft"
];
propagatedBuildInputs = [ inputproto ]
propagatedBuildInputs = [ xorgproto ]
++ (if stdenv.isDarwin
then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
else [ xlibsWrapper libXi freeglut ]);

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, libX11, libXext, xextproto, libjpeg, libungif, libtiff, libpng}:
{stdenv, fetchurl, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}:
stdenv.mkDerivation {
name = "imlib-1.9.15";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
"--x-libraries=${libX11.out}/lib"
];
buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];
buildInputs = [libjpeg libXext libX11 xorgproto libtiff libungif libpng];
meta = with stdenv.lib; {
description = "An image loading and rendering library for X11";

View file

@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "10bq6fy8d3pr1x2x3xx9qhf2hdxrwdgvg843a2y6lx70y1jfj0c5";
};
buildInputs = [ libclthreads libX11 libXft xorg.xproto ];
buildInputs = [ libclthreads libX11 libXft xorg.xorgproto ];
nativeBuildInputs = [ pkgconfig ];
NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include";
NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include";
patchPhase = ''
cd source

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xextproto }:
{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }:
stdenv.mkDerivation rec {
name = "libfakekey-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXi libXtst xextproto ];
buildInputs = [ libX11 libXi libXtst xorgproto ];
meta = with stdenv.lib; {
description = "X virtual keyboard library";

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto }:
let
driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkgconfig python2 ];
buildInputs = [ libX11 libXext glproto ];
buildInputs = [ libX11 libXext xorgproto ];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/GLX/Makefile.am \

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = with xorg; [ dri2proto libXext ];
buildInputs = with xorg; [ xorgproto libXext ];
propagatedBuildInputs = [ xorg.libX11 ];

View file

@ -145,8 +145,7 @@ let self = stdenv.mkDerivation {
++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
buildInputs = with xorg; [
expat llvmPackages.llvm libglvnd
glproto dri2proto dri3proto presentproto
expat llvmPackages.llvm libglvnd xorgproto
libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
libffi libvdpau libelf libXvMC
libpthreadstubs openssl /*or another sha1 provider*/

View file

@ -1,10 +1,10 @@
{ fetchFromGitHub, stdenv, lib
, cmake, libGLU_combined
, freetype, freeimage, zziplib, randrproto, libXrandr
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, xproto, libX11, libXmu, libSM, pkgconfig
, libXxf86vm, xf86vidmodeproto, libICE
, renderproto, libXrender
, libX11, libXmu, libSM, pkgconfig
, libXxf86vm, libICE
, libXrender
, withNvidiaCg ? false, nvidia_cg_toolkit
, withSamples ? false }:
@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
buildInputs =
[ cmake libGLU_combined
freetype freeimage zziplib randrproto libXrandr
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
xproto libX11 libXmu libSM pkgconfig
libXxf86vm xf86vidmodeproto libICE
renderproto libXrender
libX11 libXmu libSM pkgconfig
libXxf86vm libICE
libXrender
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
meta = {

View file

@ -1,10 +1,10 @@
{ fetchurl, stdenv, lib
, cmake, libGLU_combined
, freetype, freeimage, zziplib, randrproto, libXrandr
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, xproto, libX11, libXmu, libSM, pkgconfig
, libXxf86vm, xf86vidmodeproto, libICE
, renderproto, libXrender
, libX11, libXmu, libSM, pkgconfig
, libXxf86vm, libICE
, libXrender
, withNvidiaCg ? false, nvidia_cg_toolkit
, withSamples ? false }:
@ -25,11 +25,11 @@ stdenv.mkDerivation {
buildInputs =
[ cmake libGLU_combined
freetype freeimage zziplib randrproto libXrandr
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
xproto libX11 libXmu libSM pkgconfig
libXxf86vm xf86vidmodeproto libICE
renderproto libXrender
libX11 libXmu libSM pkgconfig
libXxf86vm libICE
libXrender
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
meta = {

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xproto
, libXi, inputproto, libXaw, libXmu, libXt }:
{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xorgproto
, libXi, libXaw, libXmu, libXt }:
let
majorVersion = "1";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
patchFlags = "-p0";
buildInputs = [
autoconf automake libtool libX11 xproto libXi inputproto libXaw
autoconf automake libtool libX11 xorgproto libXi libXaw
libXmu libXt
];

View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl
, xftSupport ? true, libXft ? null
, xrenderSupport ? true, libXrender ? null
, xrandrSupport ? true, libXrandr ? null, randrproto ? null
, xrandrSupport ? true, libXrandr ? null
, xineramaSupport ? true, libXinerama ? null
, cursorSupport ? true, libXcursor ? null
, threadSupport ? true
, mysqlSupport ? false, mysql ? null
, openglSupport ? false, libGLU_combined ? null, libXmu ? null
, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which
, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
}:
assert xftSupport -> libXft != null;
assert xrenderSupport -> xftSupport && libXrender != null;
assert xrandrSupport -> libXrandr != null && randrproto != null;
assert xrandrSupport -> libXrandr != null;
assert cursorSupport -> libXcursor != null;
assert mysqlSupport -> mysql != null;
assert openglSupport -> libGLU_combined != null && libXmu != null;
@ -40,7 +40,7 @@ stdenv.mkDerivation {
"-v"
"-system-zlib" "-system-libpng" "-system-libjpeg"
"-qt-gif"
"-I${xextproto}/include"
"-I${xorgproto}/include"
(mk threadSupport "thread")
(mk xrenderSupport "xrender")
(mk xrandrSupport "xrandr")
@ -55,7 +55,6 @@ stdenv.mkDerivation {
"-L${libXrender.out}/lib" "-I${libXrender.dev}/include"
] ++ stdenv.lib.optionals xrandrSupport [
"-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include"
"-I${randrproto}/include"
] ++ stdenv.lib.optionals xineramaSupport [
"-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include"
] ++ stdenv.lib.optionals cursorSupport [

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi
, inputproto, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut
{ stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi
, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut
, openscenegraph, openal, expat, cmake, apr
, curl
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5";
};
buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto
buildInputs = [ plib freeglut xorgproto libX11 libXext libXi
libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut
openscenegraph openal expat cmake apr curl ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xproto, libXt
{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt
, qtLib ? null
# Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs =
if !stdenv.isDarwin
then [ cmake libGLU_combined libX11 xproto libXt ] ++ optional (qtLib != null) qtLib
then [ cmake libGLU_combined libX11 xorgproto libXt ] ++ optional (qtLib != null) qtLib
else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private
CFNetwork Security ApplicationServices CoreText IOSurface ImageIO
OpenGL GLUT ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
, gstreamer, gst-plugins-base, GConf, libX11, cairo
, withMesa ? true, libGLU ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true,
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
};
buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ]
buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ]
++ optional withMesa libGLU;
nativeBuildInputs = [ pkgconfig ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
, gstreamer, gst-plugins-base, GConf, setfile
, withMesa ? true, libGLU ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true
@ -29,7 +29,7 @@ stdenv.mkDerivation {
];
buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
[ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer
gst-plugins-base GConf ]
++ optional withMesa libGLU
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig
, gtk2, gtk3, libXinerama, libSM, libXxf86vm
, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile
, xorgproto, gstreamer, gst-plugins-base, GConf, setfile
, withMesa ? true, libGLU ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true
, withGtk2 ? true
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
[ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer
gst-plugins-base GConf ]
++ optional withMesa libGLU
++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)

View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }:
{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }:
let
majorVersion = "0.63";
@ -14,7 +14,7 @@ in buildPythonPackage rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xextproto xproto ];
buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xorgproto ];
meta = with lib; {
description = "Extension to emulate keypresses and to get the layout information from the X server";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
, procps, utilmacros, gnome2, openssl, peg }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig utilmacros ];
buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod
libXext libXv libXrandr glib bison libunwind python3 procps
gnome2.gtkdoc openssl peg ];

View file

@ -1,7 +1,7 @@
{ stdenv, lib, perl, fetchurl, python2
, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2
, openal, libGLU_combined, xorgproto, libX11, libXcursor, nspr, SDL2
, gloox, nvidia-texture-tools
, withEditor ? true, wxGTK ? null
}:
@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
buildInputs = [
spidermonkey_38 boost icu libxml2 libpng libjpeg
zlib curl libogg libvorbis enet miniupnpc openal
libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox
libGLU_combined xorgproto libX11 libXcursor nspr SDL2 gloox
nvidia-texture-tools libsodium
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = [
"-I${xproto}/include/X11"
"-I${xorgproto}/include/X11"
"-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11"
"-I${SDL2}/include/SDL2"

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, zlib, xproto, libGL ? null, freeglut ? null }:
{ stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, freeglut ? null }:
stdenv.mkDerivation rec {
name = "construo-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa";
};
buildInputs = [ libX11 zlib xproto ]
buildInputs = [ libX11 zlib xorgproto ]
++ stdenv.lib.optional (libGL != null) libGL
++ stdenv.lib.optional (freeglut != null) freeglut;

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libGLU_combined, libX11, xproto, tcl, freeglut, freetype
, sfml, libXi, inputproto
, libXmu, libXext, xextproto, libXt, libSM, libICE
{ stdenv, fetchurl, libGLU_combined, libX11, xorgproto, tcl, freeglut, freetype
, sfml, libXi
, libXmu, libXext, libXt, libSM, libICE
, libpng, pkgconfig, gettext, intltool
}:
@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
};
buildInputs = [
libGLU_combined libX11 xproto tcl freeglut freetype
sfml libXi inputproto
libXmu libXext xextproto libXt libSM libICE
libGLU_combined libX11 xorgproto tcl freeglut freetype
sfml libXi
libXmu libXext libXt libSM libICE
libpng pkgconfig gettext intltool
];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper
, freeglut, freealut, libGLU_combined, libICE, libjpeg, openal, openscenegraph, plib
, libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto
, libSM, libunwind, libX11, xorgproto, libXext, libXi
, libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
, makeDesktopItem, qtbase, qtdeclarative, glew
}:
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [
makeWrapper
freeglut freealut libGLU_combined libICE libjpeg openal openscenegraph plib
libSM libunwind libX11 xproto libXext xextproto libXi inputproto
libSM libunwind libX11 xorgproto libXext libXi
libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase
glew qtdeclarative
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xproto }:
{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xorgproto }:
stdenv.mkDerivation {
name = "fsg-4.4";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 glib libGLU_combined wxGTK libX11 xproto ];
buildInputs = [ gtk2 glib libGLU_combined wxGTK libX11 xorgproto ];
preBuild = ''
sed -e '

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, libX11, libXext, xextproto, libICE, libSM, xproto, libpng12, zlib }:
{ stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }:
stdenv.mkDerivation rec {
name = "lincity-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libICE libpng12 libSM libX11 libXext
xextproto zlib xproto
xorgproto zlib
];
patches = [

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig
, zlib, libxml2, libxslt, xproto, libX11, libGLU_combined, SDL
, zlib, libxml2, libxslt, xorgproto, libX11, libGLU_combined, SDL
, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs
}:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
zlib libxml2 libxslt xproto libX11 libGLU_combined SDL SDL_mixer SDL_image
zlib libxml2 libxslt xorgproto libX11 libGLU_combined SDL SDL_mixer SDL_image
SDL_ttf SDL_gfx physfs
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xproto, libX11, libXrender
{ stdenv, fetchurl, xorgproto, libX11, libXrender
, gmp, libjpeg, libpng
, expat, gettext, perl, guile
, SDL, SDL_image, SDL_mixer, SDL_ttf
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
xproto libX11 gmp guile
xorgproto libX11 gmp guile
libjpeg libpng
expat gettext perl
SDL SDL_image SDL_mixer SDL_ttf

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, xproto, gd, SDL, SDL_image, SDL_mixer, zlib
{ stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib
, libxml2, pkgconfig, curl, cmake, libzip }:
stdenv.mkDerivation {
@ -28,7 +28,7 @@ stdenv.mkDerivation {
cp -R ../share/gamedir/* $out/share/OpenLieroX
'';
buildInputs = [ libX11 xproto gd SDL SDL_image SDL_mixer zlib libxml2
buildInputs = [ libX11 xorgproto gd SDL SDL_image SDL_mixer zlib libxml2
pkgconfig curl cmake libzip ];
meta = {

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
{ fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto,
libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat,
libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis}:
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xproto
buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xorgproto
libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat
SDL2 enet libjpeg openscenegraph libvorbis ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xproto, libX11
, libXi, inputproto, libXmu, libXext, xextproto, libGLU_combined }:
{ stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xorgproto, libX11
, libXi, libXmu, libXext, libGLU_combined }:
stdenv.mkDerivation rec {
name = "stardust-${version}";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
zlib libtiff libxml2 SDL xproto libX11 libXi inputproto
libXmu libXext xextproto libGLU_combined
zlib libtiff libxml2 SDL xorgproto libX11 libXi
libXmu libXext libGLU_combined
];
installFlags = [ "bindir=\${out}/bin" ];

View file

@ -1,4 +1,4 @@
{ fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
{ fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto,
libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis,
libpng, zlib, makeWrapper }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in
'';
buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xproto
buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xorgproto
libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ];
installTargets = "install datainstall";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake
, zlib, curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer
, SDL_net, SDL_ttf, libunwind, libX11, xproto, libxml2, pkgconfig
, SDL_net, SDL_ttf, libunwind, libX11, xorgproto, libxml2, pkgconfig
, gettext, intltool, libtool, perl
}:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
zlib curl gnutls fribidi libpng SDL SDL_gfx SDL_image SDL_mixer
SDL_net SDL_ttf libunwind libX11 xproto libxml2 perl
SDL_net SDL_ttf libunwind libX11 xorgproto libxml2 perl
];
enableParallelBuilding = true;

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, libX11, xproto, libXt, libXaw, libSM, libICE, libXmu
{stdenv, fetchurl, libX11, xorgproto, libXt, libXaw, libSM, libICE, libXmu
, libXext, gnuchess, texinfo, libXpm, pkgconfig, librsvg, cairo, pango
, gtk2
}:
@ -13,7 +13,7 @@ let
sha256="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib";
};
buildInputs = [
libX11 xproto libXt libXaw libSM libICE libXmu
libX11 xorgproto libXt libXaw libSM libICE libXmu
libXext gnuchess texinfo libXpm pkgconfig librsvg
cairo pango gtk2
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cpio, xproto, libX11, libXmu, libXaw, libXt, tcl, tk
{ stdenv, fetchurl, cpio, xorgproto, libX11, libXmu, libXaw, libXt, tcl, tk
, libXext, fontconfig, makeWrapper }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1za78yx57mgwcmmi33wx3533yz1x093dnqis8q2qmqivxav51lca";
};
buildInputs = [ cpio xproto libX11 libXmu libXaw libXt tcl tk libXext
buildInputs = [ cpio xorgproto libX11 libXmu libXaw libXt tcl tk libXext
fontconfig makeWrapper ];
configureFlags = [

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, xproto, libXpm, libXt }:
{ stdenv, fetchurl, libX11, xorgproto, libXpm, libXt }:
stdenv.mkDerivation rec {
name = "xsokoban-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9";
};
buildInputs = [ libX11 xproto libXpm libXt ];
buildInputs = [ libX11 xorgproto libXpm libXt ];
NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11";

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=";

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;

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";

View file

@ -263,7 +263,7 @@ if test -z "$libsOnly"; then
cd programs/fglrx_gamma
gcc -fPIC -I${libXxf86vm.dev}/include \
-I${xf86vidmodeproto}/include \
-I${xorgproto}/include \
-I$out/X11R6/include \
-L$out/lib \
-Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c

View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
libXrandr = xorg.libXrandr;
libXrender = xorg.libXrender;
libXxf86vm = xorg.libXxf86vm;
xf86vidmodeproto = xorg.xf86vidmodeproto;
xorgproto = xorg.xorgproto;
libSM = xorg.libSM;
libICE = xorg.libICE;
libfreetype = freetype;
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE
xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE
patchelf
unzip
libGLU_combined
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
# outputs TODO: probably many fixes are needed;
LD_LIBRARY_PATH = makeLibraryPath
[ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE
xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE
libGLU_combined
fontconfig
freetype

Some files were not shown because too many files have changed in this diff Show more