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/spring | |
| parent | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff) | |
| download | nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.gz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.bz2 nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.lz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.xz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.zst nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.zip | |
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/spring')
| -rw-r--r-- | pkgs/games/spring/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index aabd3656505..fe764c90b4b 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; |