Skip to content

linuxPackages.amdgpu-pro: use libffi_3_3, not an override#280002

Merged
wegank merged 1 commit intoNixOS:masterfrom
trofi:amdgpu-pro-libffi-pin
Jan 10, 2024
Merged

linuxPackages.amdgpu-pro: use libffi_3_3, not an override#280002
wegank merged 1 commit intoNixOS:masterfrom
trofi:amdgpu-pro-libffi-pin

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jan 10, 2024

Without the change amdgpu-pro tried to build libffi-3.3 with patches for libffi-3.4 and failed as:

patching file include/ffi_common.h
Hunk #1 succeeded at 103 with fuzz 2 (offset -25 lines).
can't find file to patch at input line 36

THe change uses libffi_3_3 instead.

Closes: #279955

Description of changes

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.

Without the change `amdgpu-pro` tried to build `libffi-3.3` with patches
for `libffi-3.4` and failed as:

    patching file include/ffi_common.h
    Hunk #1 succeeded at 103 with fuzz 2 (offset -25 lines).
    can't find file to patch at input line 36

THe change uses `libffi_3_3` instead.

Closes: NixOS#279955
@trofi trofi mentioned this pull request Jan 10, 2024
@trofi
Copy link
Contributor Author

trofi commented Jan 10, 2024

/cc @corngood

@ofborg ofborg bot requested a review from corngood January 10, 2024 10:06
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 10, 2024
@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jan 10, 2024
@wegank wegank merged commit 0b9c8af into NixOS:master Jan 10, 2024
@trofi trofi deleted the amdgpu-pro-libffi-pin branch January 10, 2024 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure: libffi

4 participants