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

Merge pull request #35462 from jfrankenau/update-geeqie

Browse Source 
geeqie: 1.3 -> 1.4
This commit is contained in:
Michael Raskin 2018-02-24 14:06:22 +00:00 committed by GitHub
commit 40186c3af2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,24 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2 { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool
, lcms, intltool, gettext, fbida , gtk3, lcms2, exiv2, libchamplain, clutter_gtk, ffmpegthumbnailer, fbida
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "geeqie-${version}"; name = "geeqie-${version}";
version = "1.3"; version = "1.4";
src = fetchurl { src = fetchurl {
url = "http://geeqie.org/${name}.tar.xz"; url = "http://geeqie.org/${name}.tar.xz";
sha256 = "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb"; sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
}; };
# Do not build the changelog as this requires markdown.
patches = [ ./geeqie-no-changelog.patch ];
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
configureFlags = [ "--enable-gps" ]; nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
autoconf automake gtk2 libpng exiv2 lcms intltool gettext gtk3 lcms2 exiv2 libchamplain clutter_gtk ffmpegthumbnailer fbida
]; ];
postInstall = '' postInstall = ''
@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
-e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH' -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH'
''; '';
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Lightweight GTK+ based image viewer"; description = "Lightweight GTK+ based image viewer";
@ -45,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = http://geeqie.sourceforge.net; homepage = http://geeqie.sourceforge.net;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ jfrankenau pSub ];
platforms = platforms.gnu; platforms = platforms.gnu;
}; };
} }

14
pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch Normal file
View File

@ -0,0 +1,14 @@
--- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500
+++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500
@@ -10,9 +10,9 @@
readmedir = @readmedir@
if HAVE_MARKDOWN
-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
else
-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
+readme_DATA = README.md COPYING TODO README.lirc AUTHORS
endif
desktopdir = $(datadir)/applications