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.

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

sile: fix strictDeps build #373209

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

FliegendeWurst
Copy link
Member

ref. #178468

Cross-build unfortunately still broken due to build-time Lua detection stuff.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

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

LGTM. I wonder what @alerque would think about this, and what would they think of the lack of cross compilation support.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jan 12, 2025
@alerque
Copy link
Contributor

alerque commented Jan 12, 2025

Isn't anything in buildInputs automatically also available wherever nativeBuildInputs would be anyway?

As for cross compilation, it isn't something I've tested upstream yet. I had reports (from Void packagers?) that they had it working with a patch that I added a couple of versions back, but I haven't actually done any cross building myself yet. It's certainly something I'd like to see working.

@FliegendeWurst
Copy link
Member Author

No, only the nativeBuildInputs get added to $PATH (if strictDeps is enabled). Which is relevant here since it looks for Lua in PATH by default.

Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

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

@alerque don't forget to also update the upstream expression.

@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
zstd
pkg-config
fontconfig # fc-match
Copy link
Contributor

Choose a reason for hiding this comment

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

I tested locally, and reached the conclusion that fontconfig can (and therefor should?) be removed from buildInputs.

@@ -101,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
gentium
];
};
env.LUA = "${finalAttrs.finalPackage.passthru.luaEnv}/bin/lua";
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we can add strictDeps here, no matter what is Nixpkgs' default.

@doronbehar
Copy link
Contributor

As for cross compilation, it isn't something I've tested upstream yet. I had reports (from Void packagers?) that they had it working with a patch that I added a couple of versions back, but I haven't actually done any cross building myself yet. It's certainly something I'd like to see working.

Can you reference us to that patch? I suspect that the way Lua packages are tested for existence in the lua environment is what makes this fail (at least nowadays).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants