Author: urkud
Date: Tue Mar 20 11:16:10 2012
New Revision: 33292
URL: https://nixos.org/websvn/nix/?rev=33292&sc=1
Log:
Add champlain support to geeqie
This commit reverts 33187 and changes libchamplain arg to libchamplain_0_6.
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/applications/graphics/geeqie/default.nix
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/applications/graphics/geeqie/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/applications/graphics/geeqie/default.nix
Tue Mar 20 11:16:06 2012 (r33291)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/applications/graphics/geeqie/default.nix
Tue Mar 20 11:16:10 2012 (r33292)
@@ -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 @@
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 =
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
