From 4e78aeb441075872c07e6d6dc45f2045a3d87e41 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 11 Jan 2018 10:17:56 -0500
Subject: callCabal2nix: Fix calling with a path in the store.

---
 pkgs/development/haskell-modules/make-package-set.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs/development/haskell-modules')

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 5a2f7fb89f0d..b91d73c9748c 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -146,7 +146,9 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
       overrideCabal (self.callPackage (haskellSrc2nix {
         inherit name;
         src = pkgs.lib.cleanSourceWith
-          { inherit src;
+          { src = if pkgs.lib.canCleanSource src
+                    then src
+                    else pkgs.safeDiscardStringContext src;
             filter = path: type:
               pkgs.lib.hasSuffix "${name}.cabal" path ||
               pkgs.lib.hasSuffix "package.yaml" path;
-- 
cgit 1.4.1