mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-12 03:56:17 +03:00
feh: 2.18.1 -> 2.18.2
This commit is contained in:
parent
36de745e1b
commit
705b2d9b66
@ -1,18 +1,22 @@
|
||||
{ stdenv, fetchurl, makeWrapper, xorg, imlib2, libjpeg, libpng
|
||||
{ stdenv, fetchurl, makeWrapper
|
||||
, xorg, imlib2, libjpeg, libpng
|
||||
, curl, libexif, perlPackages }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "feh-2.18.1";
|
||||
name = "feh-${version}";
|
||||
version = "2.18.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://feh.finalrewind.org/${name}.tar.bz2";
|
||||
sha256 = "1ck55rhh5ax1d9k9gy2crvyjwffh6028f4kxaisd8ymgbql40f2c";
|
||||
sha256 = "09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
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 ];
|
||||
|
||||
@ -20,10 +24,12 @@ stdenv.mkDerivation rec {
|
||||
makeFlags="PREFIX=$out exif=1"
|
||||
'';
|
||||
|
||||
libPath = makeLibraryPath ([ imlib2 curl xorg.libXinerama libjpeg libpng libexif xorg.libX11 ]);
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \
|
||||
--add-flags '--theme=feh'
|
||||
'';
|
||||
--add-flags '--theme=feh'
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test
|
||||
@ -33,8 +39,8 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "A light-weight image viewer";
|
||||
homepage = https://derf.homelinux.org/projects/feh/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; unix;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.viric ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user