Geeqie: Use libchamplain.

svn path=/nixpkgs/trunk/; revision=22650

pkgs/applications/graphics/geeqie/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
-, intltool, gettext }:
+, intltool, gettext, libchamplain }:
 
 stdenv.mkDerivation rec {
   name = "geeqie-1.0";
@@ -9,7 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "1p8z47cqdqqkn8b0fr5bqsfinz4dgqk4353s8f8d9ha6cik69bfi";
   };
 
-  buildInputs = [ pkgconfig gtk libpng exiv2 lcms intltool gettext ];
+  preConfigure =
+    # XXX: Trick to have Geeqie use the version we have.
+    '' sed -i "configure" \
+           -e 's/champlain-0.4/champlain-0.6/g ;
+               s/champlain-gtk-0.4/champlain-gtk-0.6/g'
+    '';
+
+  configureFlags = [ "--enable-gps" ];
+
+  buildInputs =
+    [ pkgconfig gtk libpng exiv2 lcms intltool gettext
+      libchamplain
+    ];
 
   meta = {
     description = "Geeqie, a lightweight GTK+ based image viewer";

pkgs/top-level/all-packages.nix

@@ -8131,7 +8131,7 @@ let
 
   geeqie = import ../applications/graphics/geeqie {
     inherit fetchurl stdenv pkgconfig libpng lcms exiv2
-      intltool gettext;
+      intltool gettext libchamplain;
     inherit (gtkLibs) gtk;
   };