nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30081 from womfoo/bump/xzgv-0.9.2

Browse Source 
xzgv: 0.9.1 -> 0.9.2
This commit is contained in:
Jörg Thalheim 2017-10-04 14:07:17 +01:00 committed by GitHub
commit d7d3125ba8
2 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/graphics/xzgv/default.nix
View File

@ -1,22 +1,23 @@
{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }: { stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xzgv-${version}"; name = "xzgv-${version}";
version = "0.9.1"; version = "0.9.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph"; sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5";
}; };
buildInputs = [ gtk2 pkgconfig texinfo ]; nativeBuildInputs = [ pkgconfig texinfo ];
patches = [ ./fix-linker-paths.patch ]; buildInputs = [ gtk2 libexif ];
postPatch = '' postPatch = ''
substituteInPlace config.mk \ substituteInPlace config.mk \
--replace /usr/local $out --replace /usr/local $out
substituteInPlace config.mk \
--replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall"
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace "all: src man" "all: src man info" --replace "all: src man" "all: src man info"
''; '';
preInstall = ''
mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps}
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://sourceforge.net/projects/xzgv/; homepage = http://sourceforge.net/projects/xzgv/;
description = "Picture viewer for X with a thumbnail-based selector"; description = "Picture viewer for X with a thumbnail-based selector";

25
pkgs/applications/graphics/xzgv/fix-linker-paths.patch
View File

@ -1,25 +0,0 @@
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)