aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/haskell-modules/lib.nix
diff options
context:
space:
mode:
authorWill Fancher <elvishjerricco@gmail.com>2018-05-17 20:35:53 -0400
committerWill Fancher <elvishjerricco@gmail.com>2018-05-17 20:35:53 -0400
commit5523ec8f3c78704c6e76b7675bfce41d24a3feb1 (patch)
tree74f23417eda150ab5d1f404814400dfe41584122 /pkgs/development/haskell-modules/lib.nix
parent50bbc56b0bd87715bc17230365fe5eb441bfac68 (diff)
Make getHaskellBuildInputs / shellFor work with overrideCabal
Diffstat (limited to '')
-rw-r--r--pkgs/development/haskell-modules/lib.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index ff86e06979c1..55e45bd6559d 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -297,8 +297,11 @@ rec {
# This is useful to build environments for developing on that
# package.
getHaskellBuildInputs = p:
- (p.override { mkDerivation = extractBuildInputs p.compiler;
- }).haskellBuildInputs;
+ (overrideCabal p (args: {
+ passthru = (args.passthru or {}) // {
+ _getHaskellBuildInputs = extractBuildInputs p.compiler args;
+ };
+ }))._getHaskellBuildInputs;
# Under normal evaluation, simply return the original package. Under
# nix-shell evaluation, return a nix-shell optimized environment.