diff options
author | ndowens <ndowens04@gmail.com> | 2017-03-18 18:10:44 -0500 |
---|---|---|
committer | vbgl <vbgl@users.noreply.github.com> | 2017-03-19 10:45:52 +0100 |
commit | 705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac (patch) | |
tree | 1f6d4fc166b294fb39948ec4b48e5e3c9e30e95d /pkgs/applications/graphics/feh | |
parent | 36de745e1b705644d22b0d7f8fc60fdedb49d2d3 (diff) | |
download | nixlib-705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac.tar nixlib-705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac.tar.gz nixlib-705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac.tar.bz2 nixlib-705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac.tar.lz nixlib-705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac.tar.xz nixlib-705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac.tar.zst nixlib-705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac.zip |
feh: 2.18.1 -> 2.18.2
Diffstat (limited to 'pkgs/applications/graphics/feh')
-rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 5b385f2acbf1..3208f4273ff2 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -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; }; } |