public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge recent master into staging

Browse Source 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
This commit is contained in:
Vladimír Čunát
2014-11-05 15:00:44 +01:00
parent c0e2aceef4 8e02bde1a8
commit 52404a868d
288 changed files with 8123 additions and 4307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/spring/default.nix
+1 -1
View File
@@ -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
pkgs/games/spring/springlobby.nix
+1 -1
View File
@@ -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 = ''