From dd0d3b9d51f226be15367bf6c90006bd0f859f06 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com>
Date: Mon, 5 Feb 2024 07:56:41 -0800
Subject: [PATCH] Switch to `buildFromSdist` (#221)

---
 CHANGELOG.md                  | 2 ++
 nix/build-haskell-package.nix | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76983dc..3d74987 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 - #210: Add `extraLibraries` to `settings` module.
 - #215: Improved debug logging.
 - #216: Remove `debug` option (pass `--trace-verbose` to nix instead)
+- Breaking changes
+  - #221: Switch to `buildFromSdist`, to allow using non-standard package sets (wherein `cabal-install` is otherwise built without using user's overrides)
 
 ## 0.4.0 (Aug 22, 2023)
 
diff --git a/nix/build-haskell-package.nix b/nix/build-haskell-package.nix
index 3563395..1c7cfbf 100644
--- a/nix/build-haskell-package.nix
+++ b/nix/build-haskell-package.nix
@@ -12,8 +12,10 @@
 }:
 
 let
-  fromSdist = self.buildFromCabalSdist or
-    (log.traceWarning "Your nixpkgs does not have hs.buildFromCabalSdist" (pkg: pkg));
+  # NOTE: We do not use the optimized version, `buildFromCabalSdist`, because it
+  # breaks in some cases. See https://github.com/srid/haskell-flake/pull/220
+  fromSdist = pkgs.haskell.lib.buildFromSdist or
+    (log.traceWarning "Your nixpkgs does not have hs.buildFromSdist" (pkg: pkg));
 
   mkNewStorePath = name: src:
     # Since 'src' may be a subdirectory of a store path