JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Geeqie: Use libchamplain.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22650
This commit is contained in:
Ludovic Courtès 2010-07-18 22:47:23 +00:00
parent cd06afd761
commit 3aee92f068
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/graphics/geeqie/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms { stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
, intltool, gettext }: , intltool, gettext, libchamplain }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "geeqie-1.0"; name = "geeqie-1.0";
@ -9,7 +9,19 @@ stdenv.mkDerivation rec {
sha256 = "1p8z47cqdqqkn8b0fr5bqsfinz4dgqk4353s8f8d9ha6cik69bfi"; 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 = { meta = {
description = "Geeqie, a lightweight GTK+ based image viewer"; description = "Geeqie, a lightweight GTK+ based image viewer";

2
pkgs/top-level/all-packages.nix
View File

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