Author: urkud
Date: Sat Mar 17 13:30:36 2012
New Revision: 33187
URL: https://nixos.org/websvn/nix/?rev=33187&sc=1
Log:
Disable libchamplain support in geeqie
It depends on old libchamplain which fails to build with newer glib.
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
Sat Mar 17 13:21:31 2012 (r33186)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/applications/graphics/geeqie/default.nix
Sat Mar 17 13:30:36 2012 (r33187)
@@ -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 @@
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 =
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
