From e779adc60706ade4ccdc837e54dcb4b0ffd94405 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Feb 2013 21:48:36 +0100
Subject: [PATCH] pkgs/build-support/cabal: set 'checkPhase' only if 'doCheck'
 is true

---
 pkgs/build-support/cabal/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 038b05df8a4..334b7e6f2c2 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -139,14 +139,12 @@
               eval "$postBuild"
             '';
 
-            checkPhase = ''
-              if [ -n "$doCheck" ]; then
-                eval "$preCheck"
+            checkPhase = stdenv.lib.optional self.doCheck ''
+              eval "$preCheck"
 
-                ./Setup test
+              ./Setup test
 
-                eval "$postCheck"
-              fi
+              eval "$postCheck"
             '';
 
             # installs via Cabal; creates a registration file for nix-support