From 2b74a47006dccf5b30548b8757eb765c09afc66a Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sat, 18 Jan 2014 18:46:18 +0100 Subject: gource: fix build gource currently fails in the configure phase: configure: error: Could not link against -lGLU ! This is a very misleading error, it seems to happen because configure doesn't find boost libraries and ends up with uninitialized variable(s). That in turn cause it to fail later with this unrelated error. Fix by using boost libraries, not only the headers. gource also grew a dependency on GLM, so add that to buildInputs. --- pkgs/applications/version-management/gource/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index d4e9af5e12b5..3b6d19e8fcf2 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,14 +11,15 @@ 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"; + 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 @@ -29,7 +30,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; }; } -- cgit 1.4.1