Merge branch 'callCabal2nix-restricted'

1 files changed, 7 insertions, 8 deletions

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 2c628eff5622..458c4eae136d 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -148,14 +148,13 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     callCabal2nix = name: src: args:
       overrideCabal (self.callPackage (haskellSrc2nix {
         inherit name;
-        src = pkgs.lib.cleanSourceWith
-          { 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;
-          };
+        src =
+          let filter = path: type:
+                pkgs.lib.hasSuffix "${name}.cabal" path ||
+                baseNameOf path == "package.yaml";
+          in if pkgs.lib.canCleanSource src
+               then pkgs.lib.cleanSourceWith { inherit src filter; }
+             else src;
       }) args) (_: { inherit src; });
 
     # : { root : Path