diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-07-18 22:47:23 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-07-18 22:47:23 +0000 |
| commit | 3aee92f0686a69a1c58b25b6fc88dff8493a445a (patch) | |
| tree | da784f49fd948064f276aeeae66e4f351ae39199 /pkgs | |
| parent | cd06afd761674b36003105fd0a6e49c6520a17aa (diff) | |
| download | nixpkgs-3aee92f0686a69a1c58b25b6fc88dff8493a445a.tar nixpkgs-3aee92f0686a69a1c58b25b6fc88dff8493a445a.tar.gz nixpkgs-3aee92f0686a69a1c58b25b6fc88dff8493a445a.tar.bz2 nixpkgs-3aee92f0686a69a1c58b25b6fc88dff8493a445a.tar.lz nixpkgs-3aee92f0686a69a1c58b25b6fc88dff8493a445a.tar.xz nixpkgs-3aee92f0686a69a1c58b25b6fc88dff8493a445a.tar.zst nixpkgs-3aee92f0686a69a1c58b25b6fc88dff8493a445a.zip | |
Geeqie: Use libchamplain.
svn path=/nixpkgs/trunk/; revision=22650
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/geeqie/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 9ec1b45a404..076c0360a08 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 }: +, 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25bf5c7327b..b08e04b792e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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; }; |