quirc: Use dylib with absolute install name on Darwin#328420
Merged
7c6f434c merged 1 commit intoNixOS:masterfrom Jul 20, 2024
Merged
quirc: Use dylib with absolute install name on Darwin#3284207c6f434c merged 1 commit intoNixOS:masterfrom
7c6f434c merged 1 commit intoNixOS:masterfrom
Conversation
Contributor
Author
|
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 |
8c8a25d to
fda7484
Compare
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.
fda7484 to
f5e6e11
Compare
7c6f434c
approved these changes
Jul 20, 2024
Member
|
Looks fine to me now, should this be merged in the current state? |
emilazy
approved these changes
Jul 20, 2024
Contributor
Author
|
@7c6f434c, yep, this is ready IMO. |
Contributor
|
OfBorg Linux builds are failing. |
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
13 tasks
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.
13 tasks
|
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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.