summary refs log tree commit diff
path: root/pkgs/applications/version-management/gource
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-01-18 18:46:18 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-01-18 19:05:33 +0100
commit2b74a47006dccf5b30548b8757eb765c09afc66a (patch)
tree9e249af5bd9f5898f49365bd0fadae838ba1ad25 /pkgs/applications/version-management/gource
parent1b4d50dbac713b08e068f703e257345f108c31c3 (diff)
downloadnixpkgs-2b74a47006dccf5b30548b8757eb765c09afc66a.tar
nixpkgs-2b74a47006dccf5b30548b8757eb765c09afc66a.tar.gz
nixpkgs-2b74a47006dccf5b30548b8757eb765c09afc66a.tar.bz2
nixpkgs-2b74a47006dccf5b30548b8757eb765c09afc66a.tar.lz
nixpkgs-2b74a47006dccf5b30548b8757eb765c09afc66a.tar.xz
nixpkgs-2b74a47006dccf5b30548b8757eb765c09afc66a.tar.zst
nixpkgs-2b74a47006dccf5b30548b8757eb765c09afc66a.zip
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.
Diffstat (limited to 'pkgs/applications/version-management/gource')
-rw-r--r--pkgs/applications/version-management/gource/default.nix10
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 d4e9af5e12b..3b6d19e8fcf 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;
   };
 }