Merge master into stdenv-updates

Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix

1 files changed, 5 insertions, 5 deletions

diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 1dab01c09fcb..13c554767743 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre
-, SDL_image, glew, mesa, boostHeaders
+, SDL_image, glew, mesa, boost, glm
 }:
 
 stdenv.mkDerivation rec {
@@ -11,16 +11,17 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boostHeaders
+    glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm
   ];
 
+  configureFlags = "--with-boost-libdir=${boost}/lib";
+
   NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
 
   meta = {
     homepage = "http://code.google.com/p/gource/";
     description = "software version control visualization tool";
     license = stdenv.lib.licenses.gpl3Plus;
-
     longDescription = ''
       Software projects are displayed by Gource as an animated tree with
       the root directory of the project at its centre. Directories
@@ -31,7 +32,6 @@ stdenv.mkDerivation rec {
       Mercurial and Bazaar and SVN. Gource can also parse logs produced
       by several third party tools for CVS repositories.
     '';
-
-    broken = true;
+    platforms = stdenv.lib.platforms.linux;
   };
 }