From 5c439ac2c33e43bb6f4c56cf0af477eff1263e77 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 31 May 2016 12:48:23 +0100
Subject: [PATCH 1/2] perlPackages.TestCommand: init at 0.11

---
 pkgs/top-level/perl-packages.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5c4d28ee200f..044f1fd6c225 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12046,6 +12046,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestCommand = buildPerlPackage {
+    name = "Test-Command-0.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.tar.gz;
+      sha256 = "0cwm3c4d49mdrbm6vgh78b3x8mk730l0zg8i7xb9z8bkx9pzr8r8";
+    };
+    meta = {
+      homepage = https://github.com/danboo/perl-test-command;
+      description = "Test routines for external commands ";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1 ];
+    };
+  };
+
   TestCPANMeta = buildPerlPackage {
     name = "Test-CPAN-Meta-0.23";
     src = fetchurl {

From b50dd8e85f95b5bdd831f0935a9046d4a725bf18 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 31 May 2016 12:48:40 +0100
Subject: [PATCH 2/2] feh: 2.15.2 -> 2.15.4

---
 pkgs/applications/graphics/feh/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 43aa8bfa1f58..2d7b88742466 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,18 +1,19 @@
 { stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng
-, libXinerama, curl, libexif }:
+, libXinerama, curl, libexif, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "feh-2.15.2";
+  name = "feh-2.15.4";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "0bnfk50y2l5zkr292l4yyws1m7ibdmr398vxj7c0djh965frpj1q";
+    sha256 = "b8a9c29f37b1349228b19866f712b677e2a150837bc46be8c5d6348dd4850758";
   };
 
   outputs = [ "out" "doc" ];
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ];
+  buildInputs = [ xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ]
+    ++ stdenv.lib.optional doCheck [ perlPackages.TestCommand perlPackages.TestHarness ];
 
   preBuild = ''
     makeFlags="PREFIX=$out exif=1"
@@ -23,6 +24,11 @@ stdenv.mkDerivation rec {
                                --add-flags '--theme=feh'
   '';
 
+  checkPhase = ''
+    PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test
+  '';
+  doCheck = true;
+
   meta = {
     description = "A light-weight image viewer";
     homepage = https://derf.homelinux.org/projects/feh/;