diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-02-17 04:03:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 04:03:35 +0000 |
| commit | 8055a33a2ac106e1ff67fd7a55bf4911a44d66db (patch) | |
| tree | 455c17c99f3fdfb0e1c0a62313adecb4c46f5d2b /pkgs/applications/graphics | |
| parent | 9dde2bab0a6978975ca3eca0a6f8d0a134c794a1 (diff) | |
| parent | dfa850f8065ced1361f7ef036328a043938b37b0 (diff) | |
Merge pull request #55621 from dtzWill/update/feh-3.1.2
feh: 3.1.1 -> 3.1.2
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 02e6a10295e92..9ef70dff76639 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31"; + sha256 = "0qjhlrgr606gc9h96w9piyd13mx63jqfbxxnan41nrh76m8d0dka"; }; outputs = [ "out" "man" "doc" ]; @@ -20,25 +20,22 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; makeFlags = [ - "PREFIX=$(out)" "exif=1" + "PREFIX=${placeholder "out"}" "exif=1" ] ++ optional stdenv.isDarwin "verscmp=0"; - postBuild = '' - pushd man - make - popd - ''; - + installTargets = [ "install" ]; postInstall = '' wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \ --add-flags '--theme=feh' - install -D -m 644 man/*.1 $out/share/man/man1 ''; checkInputs = [ perlPackages.perl perlPackages.TestCommand ]; preCheck = '' export PERL5LIB="${perlPackages.TestCommand}/${perlPackages.perl.libPrefix}" ''; + postCheck = '' + unset PERL5LIB + ''; doCheck = true; |