about summary refs log tree commit diff
path: root/pkgs/applications/graphics/feh
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-06-03 14:41:41 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-06-03 14:41:41 +0000
commite8fc7c3d9e2f059180a67f687ba6e4d29850ba4d (patch)
tree01faf66ac51f5556d8548f27f4c956b54ad5f470 /pkgs/applications/graphics/feh
parentb8c2a1bebead4a06117397eac794ff8a448156ba (diff)
downloadnixlib-e8fc7c3d9e2f059180a67f687ba6e4d29850ba4d.tar
nixlib-e8fc7c3d9e2f059180a67f687ba6e4d29850ba4d.tar.gz
nixlib-e8fc7c3d9e2f059180a67f687ba6e4d29850ba4d.tar.bz2
nixlib-e8fc7c3d9e2f059180a67f687ba6e4d29850ba4d.tar.lz
nixlib-e8fc7c3d9e2f059180a67f687ba6e4d29850ba4d.tar.xz
nixlib-e8fc7c3d9e2f059180a67f687ba6e4d29850ba4d.tar.zst
nixlib-e8fc7c3d9e2f059180a67f687ba6e4d29850ba4d.zip
Updating feh.
svn path=/nixpkgs/trunk/; revision=22127
Diffstat (limited to 'pkgs/applications/graphics/feh')
-rw-r--r--pkgs/applications/graphics/feh/default.nix20
1 files changed, 14 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;
   };
 }