public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feh: 2.15.2 -> 2.15.4

Browse Source
This commit is contained in:
Marius Bakke 2016-05-31 12:48:40 +01:00
parent 5c439ac2c3
commit b50dd8e85f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/graphics/feh/default.nix
View File

@ -1,18 +1,19 @@
{ stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng { stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng
, libXinerama, curl, libexif }: , libXinerama, curl, libexif, perlPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "feh-2.15.2"; name = "feh-2.15.4";
src = fetchurl { src = fetchurl {
url = "http://feh.finalrewind.org/${name}.tar.bz2"; url = "http://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "0bnfk50y2l5zkr292l4yyws1m7ibdmr398vxj7c0djh965frpj1q"; sha256 = "b8a9c29f37b1349228b19866f712b677e2a150837bc46be8c5d6348dd4850758";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ]; buildInputs = [ xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ]
++ stdenv.lib.optional doCheck [ perlPackages.TestCommand perlPackages.TestHarness ];
preBuild = '' preBuild = ''
makeFlags="PREFIX=$out exif=1" makeFlags="PREFIX=$out exif=1"
@ -23,6 +24,11 @@ stdenv.mkDerivation rec {
--add-flags '--theme=feh' --add-flags '--theme=feh'
''; '';
checkPhase = ''
PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test
'';
doCheck = true;
meta = { meta = {
description = "A light-weight image viewer"; description = "A light-weight image viewer";
homepage = https://derf.homelinux.org/projects/feh/; homepage = https://derf.homelinux.org/projects/feh/;