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

[Backport release-23.11] jbig2dec cross fix #275825

Merged
merged 2 commits into from
Dec 24, 2023

Conversation

avnik
Copy link
Contributor

@avnik avnik commented Dec 21, 2023

Description of changes

Fix cross-compilation issues, backport of #266254 and #275027

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

Add a 👍 reaction to pull requests you find important.

Adam Joseph and others added 2 commits December 16, 2023 18:17
jbig2dec's ./autogen.sh script expects to call ./configure itself,
so any flags we want to have passed to ./configure (like --host)
need to be passed to autogen.sh.

The simple way to accomplish this is to simply set configureScript
to autogen.sh.

(cherry picked from commit f4c5149)
(cherry picked from commit 3d69cf4)
@avnik
Copy link
Contributor Author

avnik commented Dec 23, 2023

@Mindavi could you take a look please?

@Mindavi Mindavi merged commit 5be0c45 into NixOS:staging-23.11 Dec 24, 2023
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants