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

feh: 2.18.1 -> 2.18.2

Browse Source
This commit is contained in:
ndowens 2017-03-18 18:10:44 -05:00 committed by vbgl
parent 36de745e1b
commit 705b2d9b66
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,22 @@
{ stdenv, fetchurl, makeWrapper, xorg, imlib2, libjpeg, libpng { stdenv, fetchurl, makeWrapper
, xorg, imlib2, libjpeg, libpng
, curl, libexif, perlPackages }: , curl, libexif, perlPackages }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "feh-2.18.1"; name = "feh-${version}";
version = "2.18.2";
src = fetchurl { src = fetchurl {
url = "http://feh.finalrewind.org/${name}.tar.bz2"; url = "http://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "1ck55rhh5ax1d9k9gy2crvyjwffh6028f4kxaisd8ymgbql40f2c"; sha256 = "09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
nativeBuildInputs = [ makeWrapper xorg.libXt ] nativeBuildInputs = [ makeWrapper xorg.libXt ]
++ stdenv.lib.optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; ++ optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ];
buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
@ -20,10 +24,12 @@ stdenv.mkDerivation rec {
makeFlags="PREFIX=$out exif=1" makeFlags="PREFIX=$out exif=1"
''; '';
libPath = makeLibraryPath ([ imlib2 curl xorg.libXinerama libjpeg libpng libexif xorg.libX11 ]);
postInstall = '' postInstall = ''
wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \ wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \
--add-flags '--theme=feh' --add-flags '--theme=feh'
''; '';
checkPhase = '' checkPhase = ''
PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test
@ -33,8 +39,8 @@ stdenv.mkDerivation rec {
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/;
license = stdenv.lib.licenses.mit; license = licenses.mit;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = [ maintainers.viric ];
platforms = with stdenv.lib.platforms; unix; platforms = platforms.unix;
}; };
} }