From 17c660f54647874b91b16860917ddc301743dfef Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 8 Aug 2018 18:19:23 +0000
Subject: [PATCH] feh: use checkInputs, fix tests
---
pkgs/applications/graphics/feh/default.nix | 8 ++++----
1 file 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;