xzgv: 0.9.1 -> 0.9.2

(cherry picked from commit fa35c52)
NixOS · Oct 4, 2017 · e677ccb · e677ccb
1 parent f86ae37
commit e677ccb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 32 deletions.
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }:
+{ stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "xzgv-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
   src = fetchurl {
     url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
-    sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
+    sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5";
   };
-  buildInputs = [ gtk2 pkgconfig texinfo ];
-  patches = [ ./fix-linker-paths.patch ];
+  nativeBuildInputs = [ pkgconfig texinfo ];
+  buildInputs = [ gtk2 libexif ];
   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"
   '';
+  preInstall = ''
+    mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps}
+  '';
   meta = with stdenv.lib; {
     homepage = http://sourceforge.net/projects/xzgv/;
     description = "Picture viewer for X with a thumbnail-based selector";

diff --git a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch