Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv

Conflicts: pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
parent c34932ef86 a2c7804903
commit 811de3bfaa
1015 changed files with 20126 additions and 5810 deletions
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
                "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
                "-DPREFER_STATIC_LIBS:BOOL=OFF"];

-  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL 
+  buildInputs = [ cmake lzma boost boost.lib 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