diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-08-08 18:19:23 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-08-11 09:35:27 +0000 |
| commit | 17c660f54647874b91b16860917ddc301743dfef (patch) | |
| tree | 65be1f2130ae6039f269527664b62970cb2f1310 /pkgs/applications/graphics/feh | |
| parent | a23183154838a60a23fdfa7f1e6ce6eb2e5ab17a (diff) | |
| download | nixpkgs-17c660f54647874b91b16860917ddc301743dfef.tar nixpkgs-17c660f54647874b91b16860917ddc301743dfef.tar.gz nixpkgs-17c660f54647874b91b16860917ddc301743dfef.tar.bz2 nixpkgs-17c660f54647874b91b16860917ddc301743dfef.tar.lz nixpkgs-17c660f54647874b91b16860917ddc301743dfef.tar.xz nixpkgs-17c660f54647874b91b16860917ddc301743dfef.tar.zst nixpkgs-17c660f54647874b91b16860917ddc301743dfef.zip | |
feh: use checkInputs, fix tests
Diffstat (limited to 'pkgs/applications/graphics/feh')
| -rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 91d5d2f1467..f10916bcd63 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ makeWrapper xorg.libXt ] - ++ optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; + nativeBuildInputs = [ makeWrapper xorg.libXt ]; 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 ''; - checkPhase = '' - PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test + checkInputs = [ perlPackages.TestCommand perlPackages.TestHarness ]; + preCheck = '' + export PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" ''; doCheck = true; |