Skip to content

Commit 9df5b22

Browse files
committed
fix: allow buildFromSdist to ignore Rust drvs
1 parent 785956b commit 9df5b22

File tree

1 file changed

+11
-4
lines changed
  • nix/modules/project/settings

1 file changed

+11
-4
lines changed

nix/modules/project/settings/all.nix

+11-4
Original file line numberDiff line numberDiff line change
@@ -318,11 +318,18 @@ in
318318
for release-worthiness.
319319
'';
320320
impl = enable:
321+
let
322+
# A version that doesn't break against Rust derivations
323+
# https://github.com/srid/haskell-flake/issues/292
324+
buildFromSdist' = drv:
325+
if !lib.hasAttr "override" drv then drv else buildFromSdist drv;
326+
in
321327
if enable then
322-
(pkg: lib.pipe pkg [
323-
buildFromSdist
324-
(x: log.traceDebug "${name}.buildFromSdist ${x.outPath}" x)
325-
]) else null;
328+
(pkg:
329+
lib.pipe pkg [
330+
buildFromSdist'
331+
(x: log.traceDebug "${name}.buildFromSdist ${x.outPath}" x)
332+
]) else null;
326333
};
327334

328335
removeReferencesTo = {

0 commit comments

Comments
 (0)