diff options
author | William A. Kennington III <william@wkennington.com> | 2014-10-01 12:55:40 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-11-02 17:22:27 -0800 |
commit | aa3e800be7a2d76419d87c23e71121a2c9424be9 (patch) | |
tree | 7eb03b8a2883b58694dac31c86d70f048b45d57b /pkgs/games | |
parent | ecfc1a7fc398482f8acecfd8fe93156a9750cee7 (diff) | |
download | nixpkgs-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar nixpkgs-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.gz nixpkgs-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.bz2 nixpkgs-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.lz nixpkgs-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.xz nixpkgs-aa3e800be7a2d76419d87c23e71121a2c9424be9.tar.zst nixpkgs-aa3e800be7a2d76419d87c23e71121a2c9424be9.zip |
boost: Remove boost.lib
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/asc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/globulation/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/pingus/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/spring/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/spring/springlobby.nix | 2 | ||||
-rw-r--r-- | pkgs/games/wesnoth/default.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 41c527f462c..5243316734e 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems buildInputs = [ - SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost boost.lib expat + SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng ]; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 7ac83d512b3..bd2a671afc9 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -8,7 +8,7 @@ let helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; - buildInputs = [ boost.lib ] + buildInputs = [ ] ++ map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index af635379ac8..43cdc2031bf 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig , mesa}: let - buildInputs = [scons SDL SDL_image boost boost.lib libpng SDL_mixer pkgconfig mesa]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer pkgconfig mesa]; s = # Generated upstream information rec { baseName="pingus"; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 1c26dde00a9..f045a8f496b 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" "-DPREFER_STATIC_LIBS:BOOL=OFF"]; - buildInputs = [ cmake lzma boost boost.lib libdevil zlib p7zip openal libvorbis freetype SDL + buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd ] ++ stdenv.lib.optional withAI jdk diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 5305759369b..bbcbd1920e9 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar - boost boost.lib libpng libX11 libnotify gtk doxygen makeWrapper + boost libpng libX11 libnotify gtk doxygen makeWrapper ]; prePatch = '' diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index c1c1b5b0756..bcd3f3a453a 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib - boost boost.lib fribidi cmake freetype libpng pkgconfig lua + boost fribidi cmake freetype libpng pkgconfig lua dbus fontconfig libtool ]; cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030 |