-
-
Notifications
You must be signed in to change notification settings - Fork 14.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sony-headphones-client: fix build for aarch64 #201971
sony-headphones-client: fix build for aarch64 #201971
Conversation
maybe we should instead set it to 255? and not remove it completely? |
Ideally we'd report our issues upstream and have them decide the proper course of action. |
6fcef76
to
069b70f
Compare
Nope.
|
Builds, but please report these issues upstream. |
is already done in Plutoberth/SonyHeadphonesClient#82 |
I expect the fix to be: Plutoberth/SonyHeadphonesClient#84 |
f9a1ca4
to
7f4a3bc
Compare
@mweinelt could you please test it with aarch again? |
ping @mweinelt |
rev = "v${version}"; | ||
hash = "sha256-0DQanrglJiGsN8qQ5KxkL8I+Fpt1abeeuKiM8v9GclM="; | ||
#rev = "v${version}"; | ||
rev = "c8f60c030bfe1987415d05241a6839648d40b358"; | ||
hash = "sha256-xRbPFaPlO5hyDQJyM4Pf56icRcJAL9H46Ep+hcl3DUg="; | ||
fetchSubmodules = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we fetch this as a patch instead of touching that logic?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel this is the least effort solution. Otherwise I will have to cleanup later...
(Additionally the original patch from github can not be reuesed due to the different sourceRoot
)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Applying a patch onto a src that uses a tag is a much more semantically valuable approach.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems more work, but sure. For anybody else this is easier to understand.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mweinelt please have a look if this is the way you wanted it.
7f4a3bc
to
424b63a
Compare
--replace "UNKNOWN = -1" "// UNKNOWN removed since it doesn't fit in char" | ||
''; | ||
patches = [ | ||
./fix-aarch64.patch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh, can't we fetchpatch
the patch? Is this not a patch you submitted upstream?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes it is.
The problem is, that the patch itself is referring to the file Client/Constants.h
.
Due to the changed sourceRoot
into the Client
folder, the path does not match... Therefore I had to adjust the path manually.
Fetching the commit while pulling the source needs the least effort, the least changes, but is unusual for other contributors.
That was what i proposed before.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you try to change into the sourceRoot in postPatch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that is easier said than done. I do not know how to easily fix this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please consider this provided change as a fix. All other solutions will have much more changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So I guess we will wait for the next release. Fixing the build seems not important...
424b63a
to
7fa49a7
Compare
Description of changes
followup of #201231.
related to #199919
Things done
sandbox = true
set 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.sh
to update generated release notes