From a6ef1ee30a5dfdb772a17449ca88e544427aa3fc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Mar 2012 11:16:10 +0000 Subject: [PATCH] Add champlain support to geeqie This commit reverts 33187 and changes libchamplain arg to libchamplain_0_6. svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33292 --- pkgs/applications/graphics/geeqie/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 3615b5d905c..a166fc7010e 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms -, intltool, gettext, fbida }: +, intltool, gettext, libchamplain_0_6, fbida }: stdenv.mkDerivation rec { name = "geeqie-1.0"; @@ -9,10 +9,18 @@ stdenv.mkDerivation rec { sha256 = "1p8z47cqdqqkn8b0fr5bqsfinz4dgqk4353s8f8d9ha6cik69bfi"; }; + 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_0_6 ]; postInstall =