Merge pull request #12078 from womfoo/xzgv

xzgv: init at 0.9.1-r55
This commit is contained in:
Pascal Wittmann 2016-01-03 15:57:07 +01:00
commit 927e82213d
3 changed files with 54 additions and 0 deletions

View File

@ -0,0 +1,27 @@
{ stdenv, fetchurl, gtk, pkgconfig, texinfo }:
stdenv.mkDerivation rec {
name = "xzgv-${version}";
version = "0.9.1";
src = fetchurl {
url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
};
buildInputs = [ gtk pkgconfig texinfo ];
patches = [ ./fix-linker-paths.patch ];
postPatch = ''
substituteInPlace config.mk \
--replace /usr/local $out
substituteInPlace config.mk \
--replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall"
substituteInPlace Makefile \
--replace "all: src man" "all: src man info"
'';
meta = with stdenv.lib; {
homepage = http://sourceforge.net/projects/xzgv/;
description = "Picture viewer for X with a thumbnail-based selector";
license = licenses.gpl2;
maintainers = [ maintainers.womfoo ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,25 @@
taken from http://sourceforge.net/p/xzgv/code/53/tree//trunk/xzgv/src/Makefile?diff=514dada434309d2ec11f5eff:52
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,8 +9,10 @@
# This gets definitions for CC, CFLAGS, BINDIR etc.
include ../config.mk
-CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
-LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
+CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \
+ `pkg-config --cflags x11`
+LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \
+ `pkg-config --libs x11` -lm
all: xzgv
@@ -23,7 +25,7 @@
backend.o
xzgv: $(OBJS)
- $(CC) $(LDFLAGS) -o xzgv $(OBJS)
+ $(CC) -o xzgv $(OBJS) $(LDFLAGS)
installdirs:
/bin/sh ../mkinstalldirs $(BINDIR)

View File

@ -13895,6 +13895,8 @@ let
inherit (gnome) scrollkeeper libglade; inherit (gnome) scrollkeeper libglade;
}; };
xzgv = callPackage ../applications/graphics/xzgv { };
yate = callPackage ../applications/misc/yate { }; yate = callPackage ../applications/misc/yate { };
inherit (gnome3) yelp; inherit (gnome3) yelp;