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/games/0ad/game.nix
+3 -3
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"