glycin-loaders: replace glycinPathsPatch with setup hook#364572
Closed
pluiedev wants to merge 5 commits intoNixOS:masterfrom
Closed
glycin-loaders: replace glycinPathsPatch with setup hook#364572pluiedev wants to merge 5 commits intoNixOS:masterfrom
glycinPathsPatch with setup hook#364572pluiedev wants to merge 5 commits intoNixOS:masterfrom
Conversation
pluiedev
force-pushed
the
push-krttwlnxvwww
branch
2 times, most recently
from
4d52b25 to
461f800
Compare
github-actions
bot
added
10.rebuild-darwin: 0
pluiedev
force-pushed
the
push-krttwlnxvwww
branch
from
461f800 to
de3e7a3
Compare
pluiedev
added
the
6.topic: GNOME
pluiedev
force-pushed
the
push-krttwlnxvwww
branch
from
de3e7a3 to
20bdac7
Compare
github-actions
bot
removed
the
6.topic: GNOME
ofborg
bot
requested review from
06kellyjac,
bobby285271,
dasj19,
hedning and
jtojnar
ofborg
bot
added
10.rebuild-darwin: 1-10
wegank
added
the
2.status: merge conflict
nixpkgs-ci
bot
added
the
2.status: stale
magneticflux-
added a commit
to magneticflux-/nixpkgs
that referenced
this pull request
Aug 16, 2025
…`glycin` Rust crate Workaround taken from `loupe` here: https://github.com/NixOS/nixpkgs/blob/e39fe935fc7537bee0440935c12f5c847735a291/pkgs/by-name/lo/loupe/package.nix#L60-L74 May be related to: NixOS#364390 NixOS#364572
13 tasks
getchoo
force-pushed
the
push-krttwlnxvwww
branch
from
20bdac7 to
cc54455
Compare
getchoo
force-pushed
the
push-krttwlnxvwww
branch
from
cc54455 to
94887da
Compare
getchoo
changed the title
glycinPathsPatch with patchHook, reformat & cleanup glycinPathsPatch with setup hook
getchoo
removed
2.status: merge conflict
Member
|
After talking with @pluiedev on Discord, I've fixed the merge conflicts, tidied up the hook itself, and made it act more like similar hooks ( Built against Loupe and all seems well 👍 |
nixpkgs-ci
bot
added
10.rebuild-darwin: 1
nixpkgs-ci
bot
added
the
8.has: documentation
nix-owners
bot
requested review from
Aleksanaa,
austinbutler and
michaelgrahamevans
getchoo
force-pushed
the
push-krttwlnxvwww
branch
from
94887da to
f21defe
Compare
nix-owners
bot
requested review from
GetPsyched,
fricklerhandwerk and
hsjobeki
`glycinPathsPatch` doesn't work with apps that use `rustPlatform.cargoSetupHook` since it assumes a setup where snapshots of GNOME sources already contain vendored Rust dependencies under `vendor/`. The setup hook instead provides a much more flexible approach that uses the `$cargoDepsCopy` variable provided by `cargoSetupHook`, which points to the local, modifiable copy of Cargo dependencies, to patch `src/sandbox.rs` just like `glycinPathsPatch`. If `$cargoDepsCopy` is not found, then the old behavior is used where Cargo dependencies are assumed to be under `vendor/`. The setup hook also consolidates the various checksum patches and additions to `gappsWrapperArgs`, making packages that use glycin much more DRY. Hopefully, new packages using glycin would be able to simply add `glycin-loaders` to their `buildInputs`, and have it work OOTB. Co-authored-by: Seth Flynn <getchoo@tuta.io>
getchoo
force-pushed
the
push-krttwlnxvwww
branch
from
f21defe to
16ab70a
Compare
getchoo
reviewed
Aug 21, 2025
Member
|
wegank
added
the
2.status: merge conflict
06kellyjac
approved these changes
Sep 22, 2025
Member
06kellyjac
left a comment
06kellyjac
left a comment
There was a problem hiding this comment.
Looks sensible.
Can we get another rebase to resolve conflicts please. Hopefully it can be merged before another conflict arises!
nixpkgs-ci
bot
added
12.approvals: 1
14 tasks
Member
|
Thank you for the patches and sorry, I somehow missed this. In the meanwhile we have introduced I took the liberty to rebase this change set and split it into more commits as part of introduction of libglycin-gtk4 in #481377 |
Member
Author
|
Superseded by #481377 |
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
6 participants
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.
glycinPathsPatchdoesn't work with apps that userustPlatform.cargoSetupHooksince it assumes a setup where snapshots of GNOME sources already contain vendored Rust dependencies undervendor/.patchHookinstead provides a much more flexible approach that uses the$cargoDepsCopyvariable provided bycargoSetupHook, which points to the local, modifiable copy of Cargo dependencies, to patchsrc/sandbox.rsjust likeglycinPathsPatch. If$cargoDepsCopyis not found, then the old behavior is used where Cargo dependencies are assumed to be undervendor/.The
patchHookalso consolidates the various checksum patches and additions togappsWrapperArgs, making packages that use glycin much more DRY. Hopefully, new packages using glycin would be able to simply addglycin-loaders.patchHookto theirnativeBuildInputs, and have it work OOTB.glycin-loadersand its dependents are also reformatted, cleaned up and brought more inline with modern standards and conventions.Closes #364390
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.