From e8fc7c3d9e2f059180a67f687ba6e4d29850ba4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 3 Jun 2010 14:41:41 +0000
Subject: [PATCH] Updating feh.

svn path=/nixpkgs/trunk/; revision=22127
---
 pkgs/applications/graphics/feh/default.nix | 20 ++++++++++++++------
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index b38bdc950247..9f520bb37fac 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,17 +1,25 @@
-{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib }:
+{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
+, libXinerama }:
 
 stdenv.mkDerivation {
-  name = "feh-1.3.4";
+  name = "feh-1.6";
 
   src = fetchurl {
-    url = http://linuxbrit.co.uk/downloads/feh-1.3.4.tar.gz;
-    sha256 = "091iz2id5z80vn2qxg0ipwncv5bv8i9ifw2q15ja9zazq6xz5fc1";
+    url = https://derf.homelinux.org/projects/feh/feh-1.6.tar.bz2;
+    sha256 = "0wkgdxvl0kdcwab815gw0xk3iniain6l3b1x4d4kclf170wcnjqi";
   };
 
-  buildInputs = [x11 imlib2 giblib libjpeg libpng];
+  buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama];
+
+  preBuild = ''
+    makeFlags="PREFIX=$out"
+  '';
 
   meta = {
     description = "A light-weight image viewer";
-    homepage = http://linuxbrit.co.uk/feh/;
+    homepage = https://derf.homelinux.org/projects/feh/;
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38423f95beae..7461fb284c6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7731,6 +7731,7 @@ let
 
   feh = import ../applications/graphics/feh {
     inherit fetchurl stdenv x11 imlib2 libjpeg libpng giblib;
+    inherit (xlibs) libXinerama;
   };
 
   firefox = firefox35;