losslesscut-bin.x86_64-appimage: fix overriding #291190
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
|
Result of 1 package built:
|
13 tasks
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/3612 |
|
is this still needed since #271071 was merged? |
I'll change this PR to remove the overriding, then. |
Pass attributes `pname` and `version` directly into appimage.wrapType2,
instead of attribute set update ('//'), to ensure that they survive
across overriding.
This is possible as the pname-version passing of buildFHSEnvBubblewrap,
buildFHSEnv, and appimageTools.wrapAppImage is fixed.[1]
[1]: NixOS#271071
ShamrockLee
force-pushed
the
losslesscut-bin-overriding
branch
from
4dddf95
to
ae8ede5
Compare
Addressed. |
eclairevoyant
approved these changes
Apr 25, 2024
ofborg
bot
added
10.rebuild-linux: 0
and removed
10.rebuild-linux: 1
10.rebuild-linux: 1-10
labels
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
To workaround
pname-and-versionissue ofappimageTools.wrapAppImage(such as the one #271071 addresses), the definition oflosslesscut-bin.x86_64-appimagemonkey patches the correctpnameandversionattribute by updating (//) the result derivation. Such update gets lost when overriding the result package with<pkg>.overrideAttrs. (Sorry for my incompetence back then.)This PR improves how
losslesscut-binattachespnameandversionto theappimageTools.wrapAppImage-based binary package for x86_64-linux by attaching attributespnameandversionthrough<pkg>.overrideAttrsinstead.Before (on x86_64-linux):
After:
This bug also exist on the stable release, and I hope to backport this PR.
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.