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

feh: use checkInputs, fix tests

This commit is contained in:
Jan Malakhovski 2018-08-08 18:19:23 +00:00
parent a231831548
commit 17c660f546
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];
nativeBuildInputs = [ makeWrapper xorg.libXt ] nativeBuildInputs = [ makeWrapper xorg.libXt ];
++ 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 ];
@ -36,8 +35,9 @@ stdenv.mkDerivation rec {
install -D -m 644 man/*.1 $out/share/man/man1 install -D -m 644 man/*.1 $out/share/man/man1
''; '';
checkPhase = '' checkInputs = [ perlPackages.TestCommand perlPackages.TestHarness ];
PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test preCheck = ''
export PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl"
''; '';
doCheck = true; doCheck = true;