From 0e64b339bc2f7aa879780701b1a45765ff02c5b7 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Tue, 2 Apr 2024 12:04:38 +0530 Subject: [PATCH] fix: apply 'patches' after 'buildFromSdist' --- nix/modules/project/settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/modules/project/settings/default.nix b/nix/modules/project/settings/default.nix index 72194707..274dce7f 100644 --- a/nix/modules/project/settings/default.nix +++ b/nix/modules/project/settings/default.nix @@ -77,8 +77,8 @@ in # In future, we can refactor this as part of https://github.com/srid/haskell-flake/issues/285 # NOTE: removeReferencesTo must apply *before* buildFromSdist, because the # later appears it fuck up the former otherwise. - impl = lib.attrsets.removeAttrs cfg.impl [ "buildFromSdist" "removeReferencesTo" ]; - fns = lib.attrValues impl ++ [ cfg.impl.buildFromSdist cfg.impl.removeReferencesTo ]; + impl = lib.attrsets.removeAttrs cfg.impl [ "buildFromSdist" "removeReferencesTo" "patches" ]; + fns = lib.attrValues impl ++ [ cfg.impl.buildFromSdist cfg.impl.removeReferencesTo cfg.impl.patches ]; in lib.pipe super.${name} ( # TODO: Do we care about the *order* of overrides?