Skip to content

Commit 2d2b4f9

Browse files
committed
Use patched version of Cabal to build nix-tools
1 parent b224850 commit 2d2b4f9

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

nix-tools/default.nix

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ lib, symlinkJoin, makeWrapper
1+
{ pkgs, lib, symlinkJoin, makeWrapper
22
, hpack, git, nix, nix-prefetch-git
33
, fetchExternal, cleanSourceHaskell, mkCabalProjectPkgSet }:
44

@@ -8,6 +8,11 @@ let
88
specJSON = ./nix-tools-src.json;
99
override = "nix-tools-src";
1010
});
11+
cabalPatch = pkgs.fetchpatch {
12+
url = "https://patch-diff.githubusercontent.com/raw/haskell/cabal/pull/6055.diff";
13+
sha256 = "145g7s3z9q8d18pxgyngvixgsm6gmwh1rgkzkhacy4krqiq0qyvx";
14+
stripLen = 1;
15+
};
1116

1217
pkgSet = mkCabalProjectPkgSet {
1318
plan-pkgs = import ./pkgs.nix;
@@ -22,6 +27,12 @@ let
2227
{
2328
packages.nix-tools.src = src;
2429
}
30+
31+
({ config, ...}: {
32+
packages = {
33+
Cabal.patches = [ cabalPatch ];
34+
};
35+
})
2536
];
2637
};
2738

0 commit comments

Comments
 (0)