xpra: fix xpraWithNvenc build #365793
Merged
xpra: fix xpraWithNvenc build #365793
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
hxtmdev
requested review from
numinit,
offlinehacker,
mvnetbiz and
CorbinWunderlich
github-actions
bot
added
10.rebuild-darwin: 0
CorbinWunderlich
approved these changes
Dec 17, 2024
wegank
added
the
12.approvals: 1
|
Backport, since it's broken in 24.11 I believe. |
wegank
added
12.approvals: 2
|
On staging-next, the build for xpra fails: |
|
It says the error. Maybe try adding clang to the build inputs? @FliegendeWurst |
|
Indeed that works. diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 34b4d0f97737..1de161cc0629 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -39,6 +39,7 @@
xorg,
xorgserver,
xxHash,
+ clang,
}:
let
@@ -99,6 +100,7 @@ buildPythonApplication rec {
INCLUDE_DIRS = "${pam}/include";
nativeBuildInputs = [
+ clang
gobject-introspection
pkg-config
wrapGAppsHook3 |
|
I bisected some, so far I got it down to a |
|
Bisect on @CorbinWunderlich can you verify that it works as intended on your hardware again? |
Seems good on nvidia 550.90.7-grid (vgpu guest driver) |
FliegendeWurst
approved these changes
Dec 23, 2024
|
Technically it should be |
|
|
fs/bin/build_cuda_kernels.py was missing shebang fixup. clang will be necessary for incoming staging changes. Tested-by: Corbin Wunderlich <[email protected]> With-suggestions-by: Corbin Wunderlich <[email protected]> Co-authored-by: Arne Keller <[email protected]>
Thanks!
I also verified that it is not included in the final output at all for some fallback path. |
|
I think you also need a python in the nativeBuildInputs (only strictly required if strictDeps = true). Unless one of the other inputs there propagates python. |
Should it be added anyway somewhere for clarity? So far, |
|
Oh, I somehow missed this package is a python application already. In that case it is available automatically. |
|
Successfully created backport PR for |
1 task
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.
fs/bin/build_cuda_kernels.pywas missing shebang fixup.Tested-by: Corbin Wunderlich [email protected]
🥳
closes #363390
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.