summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/0ad/game.nix6
-rw-r--r--pkgs/games/construo/default.nix4
-rw-r--r--pkgs/games/extremetuxracer/default.nix12
-rw-r--r--pkgs/games/flightgear/default.nix4
-rw-r--r--pkgs/games/fsg/default.nix4
-rw-r--r--pkgs/games/lincity/default.nix4
-rw-r--r--pkgs/games/lincity/ng.nix4
-rw-r--r--pkgs/games/liquidwar/default.nix4
-rw-r--r--pkgs/games/openlierox/default.nix4
-rw-r--r--pkgs/games/speed-dreams/default.nix4
-rw-r--r--pkgs/games/stardust/default.nix8
-rw-r--r--pkgs/games/torcs/default.nix4
-rw-r--r--pkgs/games/warmux/default.nix4
-rw-r--r--pkgs/games/xboard/default.nix4
-rw-r--r--pkgs/games/xconq/default.nix4
-rw-r--r--pkgs/games/xsokoban/default.nix4
16 files changed, 39 insertions, 39 deletions
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index ab9ffd0470b..29513c88418 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -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"
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
index 38a67289d39..c6ccac69b8c 100644
--- a/pkgs/games/construo/default.nix
+++ b/pkgs/games/construo/default.nix
@@ -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;
 
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index 26703b8288e..fba1ce01c45 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -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
   ];
 
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index f3b77d87e17..b70dec62388 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -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
   ];
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index b662588acaa..5c8d2541a01 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -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 '
diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index 6d8fddf3899..0abbfda33c7 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -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 = [
diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix
index a5142dba88f..b860d2ee58b 100644
--- a/pkgs/games/lincity/ng.nix
+++ b/pkgs/games/lincity/ng.nix
@@ -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
   ];
 
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 303855fb348..af7101f216d 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -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
diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix
index 2b3e065e6b6..4b1385f3e10 100644
--- a/pkgs/games/openlierox/default.nix
+++ b/pkgs/games/openlierox/default.nix
@@ -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 = {
diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix
index 5f6e20c39b6..ad0c7441d7f 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/games/speed-dreams/default.nix
@@ -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 ];
 
diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix
index 5130db6cb3c..1408b66ab41 100644
--- a/pkgs/games/stardust/default.nix
+++ b/pkgs/games/stardust/default.nix
@@ -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" ];
diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index b941f3bd2e0..f1718201998 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -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";
diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix
index c99183bfbea..04712b3ebff 100644
--- a/pkgs/games/warmux/default.nix
+++ b/pkgs/games/warmux/default.nix
@@ -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;
 
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index c2c0dc764df..4a8e7188ce8 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -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
   ];
diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix
index 82dfd217217..6e852639979 100644
--- a/pkgs/games/xconq/default.nix
+++ b/pkgs/games/xconq/default.nix
@@ -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 = [
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index 3e9add56903..cf08db68cf0 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -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";
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-01 21:11:56 +0000