cairo: add patch to fix crashes on darwin #178551
Merged
Conversation
This file contains 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
ofborg
bot
added
6.topic: darwin
|
This should target staging, see https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging for instructions. |
|
Sorry for the noise changing from master to staging.. |
jiegec
force-pushed
the
master
branch
2 times, most recently
from
cb764e8
to
444c98d
Compare
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
| @@ -55,6 +55,13 @@ in stdenv.mkDerivation rec { | |||
| ] ++ optionals stdenv.hostPlatform.isDarwin [ | |||
There was a problem hiding this comment.
This conditional should be removed to make sure the patches don't bitrot.
There was a problem hiding this comment.
Done, the check is removed.
Apply patches regardless of os.
ofborg
bot
added
10.rebuild-linux: 501+
10.rebuild-linux: 5001+
and removed
10.rebuild-linux: 0
labels
SuperSandro2000
approved these changes
Jul 7, 2022
This was referenced Jul 13, 2022
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
Apply fixes from https://gitlab.freedesktop.org/cairo/cairo/-/issues/420
This patch is applied by Homebrew and MacPorts as well.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes