about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-01-11 10:17:56 -0500
committerShea Levy <shea@shealevy.com>2018-01-11 10:17:56 -0500
commit4e78aeb441075872c07e6d6dc45f2045a3d87e41 (patch)
treeb5bcd070f4e7a1b0fc959e19385a1e2cd3fdd83e /pkgs/development/haskell-modules
parent7fedfeabae0a721cc3d592e1e7cb16c40eaa8912 (diff)
downloadnixlib-4e78aeb441075872c07e6d6dc45f2045a3d87e41.tar
nixlib-4e78aeb441075872c07e6d6dc45f2045a3d87e41.tar.gz
nixlib-4e78aeb441075872c07e6d6dc45f2045a3d87e41.tar.bz2
nixlib-4e78aeb441075872c07e6d6dc45f2045a3d87e41.tar.lz
nixlib-4e78aeb441075872c07e6d6dc45f2045a3d87e41.tar.xz
nixlib-4e78aeb441075872c07e6d6dc45f2045a3d87e41.tar.zst
nixlib-4e78aeb441075872c07e6d6dc45f2045a3d87e41.zip
callCabal2nix: Fix calling with a path in the store.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/make-package-set.nix4
1 files changed, 3 insertions, 1 deletions
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;