diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:26:18 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:54:34 +0200 |
commit | 88c9f8b574ead01e32c5ee5228679723343cd52c (patch) | |
tree | 92196d2055a7842ae40c022581220bace87ab9e1 /pkgs/games | |
parent | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff) |
xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before.
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/adom/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/megaglest/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/planetaryannihilation/default.nix | 8 | ||||
-rw-r--r-- | pkgs/games/sdlmame/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/snake4/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/spring/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/steam/chrootenv.nix | 36 | ||||
-rw-r--r-- | pkgs/games/ue4demos/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/ut2004demo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/zoom/default.nix | 2 |
10 files changed, 37 insertions, 37 deletions
diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 74fe5232fa11d..07075571c7e3d 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio -, xlibs }: +, xorg }: assert stdenv.system == "x86_64-linux"; let - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 2de42fd86eed8..059fa74f8be14 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xlibs, makeWrapper, bash, which, gnome3, mesa_glu +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu , mesa_drivers }: let version = "3.9.2"; lib-env = buildEnv { name = "megaglest-lib-env"; - paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext + paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ]; }; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index a94f388b322cc..ed682e7bed93d 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, patchelf, makeWrapper, xlibs, gtk, glib, udev, alsaLib, atk +{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk, glib, udev, alsaLib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,12 +34,12 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.glibc xorg.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f done ''; diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 6e063a34bc82d..7cc4c2b96b1e7 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xlibs }: +{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.cc.cc}/lib" \ + --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xorg.libX11}/lib:${xorg.libXinerama}/lib:${stdenv.cc.cc}/lib" \ share/sdlmame/sdlmame mkdir -p "$out/bin" diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index 081604d2ce8e8..2899f7120983d 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, shhmsg, shhopt, xlibs }: +{ stdenv, fetchurl, shhmsg, shhopt, xorg }: stdenv.mkDerivation rec { name = "snake4-1.0.14"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9"; }; - buildInputs = with xlibs; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext]; + buildInputs = with xorg; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext]; preInstall = '' substituteInPlace Makefile --replace "-o \$(OWNER) -g \$(GROUP)" "" diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index aabd3656505ba..fe764c90b4b0c 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils +, openal, libvorbis, glew, freetype, xorg, SDL, mesa, binutils , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd , withAI ? true # support for AI Interfaces and Skirmish AIs @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL - xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper + xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index b9d13265ce76f..ffd68562dee86 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -13,7 +13,7 @@ buildFHSUserEnv { pkgs.python pkgs.gnome2.zenity pkgs.xdg_utils - pkgs.xlibs.xrandr + pkgs.xorg.xrandr pkgs.which ] ++ lib.optional (config.steam.java or false) pkgs.jdk @@ -28,23 +28,23 @@ buildFHSUserEnv { pkgs.pango pkgs.freetype - pkgs.xlibs.libICE - pkgs.xlibs.libSM - pkgs.xlibs.libX11 - pkgs.xlibs.libXau - pkgs.xlibs.libxcb - pkgs.xlibs.libXcursor - pkgs.xlibs.libXdamage - pkgs.xlibs.libXdmcp - pkgs.xlibs.libXext - pkgs.xlibs.libXfixes - pkgs.xlibs.libXi - pkgs.xlibs.libXinerama - pkgs.xlibs.libXrandr - pkgs.xlibs.libXrender - pkgs.xlibs.libXScrnSaver - pkgs.xlibs.libXtst - pkgs.xlibs.libXxf86vm + pkgs.xorg.libICE + pkgs.xorg.libSM + pkgs.xorg.libX11 + pkgs.xorg.libXau + pkgs.xorg.libxcb + pkgs.xorg.libXcursor + pkgs.xorg.libXdamage + pkgs.xorg.libXdmcp + pkgs.xorg.libXext + pkgs.xorg.libXfixes + pkgs.xorg.libXi + pkgs.xorg.libXinerama + pkgs.xorg.libXrandr + pkgs.xorg.libXrender + pkgs.xorg.libXScrnSaver + pkgs.xorg.libXtst + pkgs.xorg.libXxf86vm pkgs.ffmpeg pkgs.libpng12 diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index a0e583e1075fe..ed2ea23d41580 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, patchelf, xlibs, openal }: +{ stdenv, fetchurl, unzip, patchelf, xorg, openal }: assert stdenv.isLinux; assert stdenv.isx86_64; @@ -11,7 +11,7 @@ let buildInputs = [ unzip patchelf ]; rtdeps = stdenv.lib.makeLibraryPath - [ xlibs.libXxf86vm xlibs.libXext openal ] + [ xorg.libXxf86vm xorg.libXext openal ] + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ]; buildCommand = diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix index a828d22ca0b04..13f770eab2bcc 100644 --- a/pkgs/games/ut2004demo/default.nix +++ b/pkgs/games/ut2004demo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, mesa}: +{stdenv, fetchurl, xorg, mesa}: assert stdenv.system == "i686-linux"; @@ -17,7 +17,7 @@ let { name = raw.name; builder = ./make-wrapper.sh; inherit raw mesa; - inherit (xlibs) libX11 libXext; + inherit (xorg) libX11 libXext; }; } diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 1ce2abf79b878..200b9c24c7db8 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: -# !!! assert freetype == xlibs.freetype +# !!! assert freetype == xorg.freetype stdenv.mkDerivation { name = "zoom-1.1.5"; |