Skip to content

Commit 985942d

Browse files
authored
fix(dev-env): fix aarch64 nix builds (#10795)
Fixes failing nix builds
1 parent be07e0f commit 985942d

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

nix/pyproject-overrides.nix

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,27 @@ in
5151
PROJ_DIR = "${lib.getBin pkgs.proj}";
5252
PROJ_INCDIR = "${lib.getDev pkgs.proj}";
5353
});
54+
}) // lib.mapAttrs (name: spec: addBuildSystems prev.${name} spec) buildSystemOverrides // {
55+
hatchling = prev.hatchling.overrideAttrs (attrs: {
56+
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ final.editables ];
57+
});
5458

55-
psygnal = prev.psygnal.overrideAttrs (_: {
59+
psygnal = prev.psygnal.overrideAttrs (attrs: {
60+
nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [
61+
final.hatchling
62+
final.pathspec
63+
final.pluggy
64+
final.packaging
65+
final.trove-classifiers
66+
];
67+
} // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
5668
src = pkgs.fetchFromGitHub {
5769
owner = "pyapp-kit";
5870
repo = prev.psygnal.pname;
5971
rev = "refs/tags/v${prev.psygnal.version}";
6072
hash = "sha256-eGJWtmw2Ps3jII4T8E6s3djzxfqcSdyPemvejal0cn4=";
6173
};
6274
});
63-
}) // lib.mapAttrs (name: spec: addBuildSystems prev.${name} spec) buildSystemOverrides // {
64-
hatchling = prev.hatchling.overrideAttrs (attrs: {
65-
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ final.editables ];
66-
});
6775

6876
mysqlclient = prev.mysqlclient.overrideAttrs (attrs: {
6977
nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ final.setuptools ];

0 commit comments

Comments
 (0)