Skip to content

libjack2: fix cross compilation#245228

Merged
vcunat merged 1 commit intoNixOS:stagingfrom
mikatammi:fix_libjack2_cross
Jul 26, 2023
Merged

libjack2: fix cross compilation#245228
vcunat merged 1 commit intoNixOS:stagingfrom
mikatammi:fix_libjack2_cross

Conversation

@mikatammi
Copy link
Copy Markdown
Contributor

@mikatammi mikatammi commented Jul 24, 2023

Description of changes

Fix cross compilation, by substituting the svnversion_regenerate.sh script's bash with buildPackages.bash, instead of host's bash.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-linux.pkgsCross.aarch64-multiplatform
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jul 24, 2023
@mikatammi
Copy link
Copy Markdown
Contributor Author

mikatammi commented Jul 24, 2023

I was a bit unsure is it good style to use buildPackages this way, or are there better ways?

Artturin
Artturin reviewed Jul 24, 2023
View reviewed changes
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 24, 2023
@mikatammi mikatammi force-pushed the fix_libjack2_cross branch from 2851098 to 6e087b6 Compare July 24, 2023 20:38
@ofborg ofborg bot requested a review from cillianderoiste July 24, 2023 20:59
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 24, 2023
@Artturin
Copy link
Copy Markdown
Member

Artturin commented Jul 24, 2023

Has to target staging https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging

@Artturin Artturin marked this pull request as draft July 24, 2023 22:52
@mikatammi mikatammi force-pushed the fix_libjack2_cross branch from 6e087b6 to 9aca462 Compare July 24, 2023 23:20
@mikatammi mikatammi changed the base branch from master to staging July 24, 2023 23:21
@mikatammi mikatammi force-pushed the fix_libjack2_cross branch from 9aca462 to ac88369 Compare July 24, 2023 23:22
@mikatammi
Copy link
Copy Markdown
Contributor Author

mikatammi commented Jul 24, 2023

Has to target staging https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging

Retargeted to staging now

@mikatammi mikatammi marked this pull request as ready for review July 24, 2023 23:22
@NickCao
Copy link
Copy Markdown
Member

NickCao commented Jul 25, 2023

LGTM, one nitpick: prePatch -> postPatch

libjack2: fix cross compilation
69d67d0 
Signed-off-by: Mika Tammi <mika.tammi@unikie.com>
@mikatammi mikatammi force-pushed the fix_libjack2_cross branch from ac88369 to 69d67d0 Compare July 26, 2023 15:00
@mikatammi
Copy link
Copy Markdown
Contributor Author

mikatammi commented Jul 26, 2023

LGTM, one nitpick: prePatch -> postPatch

Fixed now!

@vcunat vcunat merged commit 082459b into NixOS:staging Jul 26, 2023
@mikatammi mikatammi deleted the fix_libjack2_cross branch July 26, 2023 18:38
@mikatammi
Copy link
Copy Markdown
Contributor Author

mikatammi commented Jul 28, 2023

Apparently the broken libjack2 has now entered NixOS-23.05 :)

Could we backport this when this gets from staging to master?

@github-actions github-actions bot mentioned this pull request Jul 28, 2023
Merged
1 task
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 28, 2023

Successfully created backport PR for staging-23.05:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NickCao NickCao NickCao approved these changes

@Artturin Artturin Artturin approved these changes

@cillianderoiste cillianderoiste Awaiting requested review from cillianderoiste

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mikatammi @Artturin @NickCao @vcunat