Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pycurl: Add curl as a depedency #1284

Merged
merged 4 commits into from
Oct 26, 2023
Merged

pycurl: Add curl as a depedency #1284

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90d6500
fix: Add pycurl override with pkgs.curl
bzadm Aug 23, 2023
3ea4428
fix: Add pycurl override with pkgs.curl (2)
bzadm Aug 23, 2023
7650ff3
fix: change from buildInputs to nativeBuildInputs
bzadm Aug 23, 2023
1217cfb
fix(pycurl): change from propagatedBuildInputs -> buildInputs
bzadm Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions overrides/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2016,6 +2016,13 @@ lib.composeManyExtensions [
}
);

pycurl = super.pycurl.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.curl ];
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.curl ];
Copy link
Contributor

@takeda takeda Aug 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly to the above comment. I believe all you need is just specify buildInputs and add pkgs.curl there.

nativeBuildInputs is meant for tooling that are typically tools that are needed during build time. Its purpose is clearer when you do cross compiling. So you would specify there things like cmake, for python it would be setuptools, poetry-core etc.

BTW: I see netcdf4 using propagatedBuildInputs but that likely is incorrect.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may need to be native for the curl-config script. (But still needn’t be propagated.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then the solution is to add curl as both a build input and a native input.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, my bad.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the review and explanation regarding the build inputs. I'll try to make the changes tomorrow.

}
);

pydantic-core = super.pydantic-core.override {
preferWheel = true;
};
Expand Down