From 23dbae430f8876a9c02a7f2a0619ea541aa3bc3f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 17 Mar 2012 13:30:36 +0000 Subject: [PATCH] Disable libchamplain support in geeqie It depends on old libchamplain which fails to build with newer glib. svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33187 --- pkgs/applications/graphics/geeqie/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 3e15eb8f867..3615b5d905c 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, libchamplain, fbida }: +, intltool, gettext, fbida }: stdenv.mkDerivation rec { name = "geeqie-1.0"; @@ -9,18 +9,10 @@ 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 ]; postInstall =