Skip to content

quirc: Use dylib with absolute install name on Darwin#328420

Merged
7c6f434c merged 1 commit intoNixOS:masterfrom
toonn:quirc-absolute-install-name
Jul 20, 2024
Merged

quirc: Use dylib with absolute install name on Darwin#328420
7c6f434c merged 1 commit intoNixOS:masterfrom
toonn:quirc-absolute-install-name

Conversation

@toonn
Copy link
Contributor

@toonn toonn commented Jul 19, 2024

Description of changes

This is a prerequisite for fixing ffmpeg_7-full on Darwin. It's a common pattern in Nixpkgs to use an absolute install name.

I upstreamed the dylib renaming in dlbeer/quirc#144 but the patch needs to be vendored because upstream changes mean it doesn't apply to the packaged release.
The patch is not strictly necessary but means the next version bump will be easier as dropping the patch will be sufficient, rather than remembering to make the other extension related 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.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 19, 2024
@toonn toonn mentioned this pull request Jul 19, 2024
13 tasks
@ofborg ofborg bot requested a review from 7c6f434c July 19, 2024 12:52
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 19, 2024
@toonn
Copy link
Contributor Author

toonn commented Jul 19, 2024

I'm changing this to draft. After talking to @emilazy, I think it's better to fetchpatch the patches, or bump to unstable and update the vendored patch, that way that doesn't have to be done next version bump and I can fix whatever causes patch unexpectedly ends in middle of line.

@toonn toonn marked this pull request as draft July 19, 2024 14:13
@toonn toonn force-pushed the quirc-absolute-install-name branch from 8c8a25d to fda7484 Compare July 19, 2024 20:10
@toonn toonn marked this pull request as ready for review July 19, 2024 20:11
@toonn toonn requested a review from emilazy July 19, 2024 20:11
Updated the vendored patch to disable building of Linux specific demos
on Darwin to be able to use fetchpatch for upstream-accepted patches and
hopefully to make the next version bump not require figuring out what to
do with the patch.
@toonn toonn force-pushed the quirc-absolute-install-name branch from fda7484 to f5e6e11 Compare July 19, 2024 21:29
@7c6f434c
Copy link
Member

Looks fine to me now, should this be merged in the current state?

@toonn
Copy link
Contributor Author

toonn commented Jul 20, 2024

@7c6f434c, yep, this is ready IMO.

@7c6f434c 7c6f434c merged commit 63911cd into NixOS:master Jul 20, 2024
@OPNA2608
Copy link
Contributor

OfBorg Linux builds are failing.

evaling implicit 'postInstall' string hook
ln: failed to create symbolic link '/nix/store/igc14rpxdci0pjw4yw7x2amx4qxwia6k-quirc-1.2/lib/libquirc.so': File exists
/nix/store/5r0df66ikad3xw06azlqvswcvncll8wa-stdenv-linux/setup: line 193: pop_var_context: head of shell_variables not a function context
error: builder for '/nix/store/2qfkvyq0ccnbw4bb91q83rx9pcd96ad1-quirc-1.2.drv' failed with exit code 1;

@OPNA2608 OPNA2608 mentioned this pull request Jul 21, 2024
13 tasks
7c6f434c added a commit to 7c6f434c/nixpkgs that referenced this pull request Jul 21, 2024
Missed that a bump in NixOS#328420 changes this part of installation
toonn added a commit to toonn/nixpkgs that referenced this pull request Jul 23, 2024
This was disabled in NixOS#322724 after NixOS#328420 fixed quirc.
@toonn toonn mentioned this pull request Jul 23, 2024
13 tasks
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/updated-flake-then-tried-to-switch-but-doesnt-work-anymore/49536/2

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

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants