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

Merge pull request #55621 from dtzWill/update/feh-3.1.2 

feh: 3.1.1 -> 3.1.2
This commit is contained in:
worldofpeace 2019-02-17 04:03:35 +00:00 committed by GitHub
parent 9dde2bab0a dfa850f806
commit 8055a33a2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "feh-${version}"; name = "feh-${version}";
version = "3.1.1"; version = "3.1.2";
src = fetchurl { src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2"; url = "https://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31"; sha256 = "0qjhlrgr606gc9h96w9piyd13mx63jqfbxxnan41nrh76m8d0dka";
}; };
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];
@ -20,25 +20,22 @@ stdenv.mkDerivation rec {
buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "exif=1" "PREFIX=${placeholder "out"}" "exif=1"
] ++ optional stdenv.isDarwin "verscmp=0"; ] ++ optional stdenv.isDarwin "verscmp=0";
postBuild = '' installTargets = [ "install" ];
pushd man
make
popd
'';
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'
install -D -m 644 man/*.1 $out/share/man/man1
''; '';
checkInputs = [ perlPackages.perl perlPackages.TestCommand ]; checkInputs = [ perlPackages.perl perlPackages.TestCommand ];
preCheck = '' preCheck = ''
export PERL5LIB="${perlPackages.TestCommand}/${perlPackages.perl.libPrefix}" export PERL5LIB="${perlPackages.TestCommand}/${perlPackages.perl.libPrefix}"
''; '';
postCheck = ''
unset PERL5LIB
'';
doCheck = true; doCheck = true;