Skip to content
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

anydesk: add missing dependencies #366250

Merged
merged 1 commit into from
Dec 31, 2024

Conversation

JarvisCraft
Copy link
Contributor

Things done

Before this, anydesk is not runnable due to unsatisfied dynamic library dependencies.
This fixes the issue by adding these dependencies.

The fix also sets GDK_BACKEND=x11 to resolve issue:

(anydesk:76719): Gdk-CRITICAL **: 21:24:19.074: gdk_x11_window_get_xid: assertion 'GDK_IS_X11_WINDOW (window)' failed

and invalid scaling.

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 18, 2024
@ofborg ofborg bot requested review from cheriimoya and shyim December 19, 2024 06:50
@gepbird
Copy link
Contributor

gepbird commented Dec 20, 2024

Thanks for making the package run again!

For me the color of the text and background is inverted at some places using this version (I only censored personal information with blue):

6 4 0

In the previous 6.3.3 version it looks good:

6 3 3

@shyim
Copy link
Member

shyim commented Dec 21, 2024

But thats nothing what we can fix right? closed source software 🤔

@gepbird
Copy link
Contributor

gepbird commented Dec 21, 2024

But thats nothing what we can fix right? closed source software 🤔

Most likely, but there's a chance it's using some environment variables from the user or it's lacking some. I've got a similar problem with another proprietary software, cisco packet tracer, which had colors messed up. The "fix" was to disable my QT dark theme (which just added some env vars).

Does it happen to you @shyim @JarvisCraft?

Copy link
Contributor

@gepbird gepbird left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With GTK_THEME= ./result/bin/anydesk it works (I have GTK_THEME=Adwaita:dark).

6 4 0-fixed

pkgs/by-name/an/anydesk/package.nix Outdated Show resolved Hide resolved
@shyim shyim added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Dec 21, 2024
@ofborg ofborg bot requested a review from shyim December 22, 2024 01:22
@TheArcaneBrony
Copy link
Contributor

It might be worth checking if Anydesk still depends on gnome2 etc?

Copy link
Contributor

@gepbird gepbird left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be worth checking if Anydesk still depends on gnome2 etc?

GUI opens without it, thanks @TheArcaneBrony !

diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix
index 5873cb7cd3d8..c9b5b8e7ef52 100644
--- a/pkgs/by-name/an/anydesk/package.nix
+++ b/pkgs/by-name/an/anydesk/package.nix
@@ -10,7 +10,6 @@
   cairo,
   gdk-pixbuf,
   glib,
-  gnome2,
   gtk3,
   dbus,
   harfbuzz,
@@ -57,7 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
       libz
       stdenv.cc.cc
       pango
-      gnome2.gtkglext
       libGLU
       libGL
       minizip
@@ -118,11 +116,6 @@ stdenv.mkDerivation (finalAttrs: {
       --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" \
       $out/bin/anydesk
 
-    # pangox is not actually necessary (it was only added as a part of gtkglext)
-    patchelf \
-      --remove-needed libpangox-1.0.so.0 \
-      $out/bin/anydesk
-
     wrapProgram $out/bin/anydesk \
       --prefix PATH : ${
         lib.makeBinPath [

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person and removed 12.approvals: 2 This PR was reviewed and approved by two reputable people labels Dec 26, 2024
@JarvisCraft JarvisCraft force-pushed the anydesk/add-missing-deps branch from 3a1d1b9 to b5f3b26 Compare December 27, 2024 11:48
@JarvisCraft
Copy link
Contributor Author

@TheArcaneBrony, @gepbird, Good catch, thanks!

Pushed this patch

Copy link
Contributor

@gepbird gepbird left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested binary, looks good

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Dec 29, 2024
@donovanglover donovanglover merged commit 663abfa into NixOS:master Dec 31, 2024
42 of 43 checks passed
@JarvisCraft JarvisCraft deleted the anydesk/add-missing-deps branch December 31, 2024 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants