summary refs log tree commit diff
path: root/pkgs/applications/networking/remote/anydesk
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-12-24 15:59:35 +0100
committerJan Tojnar <jtojnar@gmail.com>2019-12-24 16:11:23 +0100
commit6c73f258858ad1ccd60c1a037e11005580df5082 (patch)
tree89cb170443239575320449c87ab084ed17ea9723 /pkgs/applications/networking/remote/anydesk
parenteeaf1f702d4b3d57b4657a162a5e536210b23efb (diff)
downloadnixpkgs-6c73f258858ad1ccd60c1a037e11005580df5082.tar
nixpkgs-6c73f258858ad1ccd60c1a037e11005580df5082.tar.gz
nixpkgs-6c73f258858ad1ccd60c1a037e11005580df5082.tar.bz2
nixpkgs-6c73f258858ad1ccd60c1a037e11005580df5082.tar.lz
nixpkgs-6c73f258858ad1ccd60c1a037e11005580df5082.tar.xz
nixpkgs-6c73f258858ad1ccd60c1a037e11005580df5082.tar.zst
nixpkgs-6c73f258858ad1ccd60c1a037e11005580df5082.zip
anydesk: remove pangox dependency
Likely just dependency of `gtkglext` since it is not listed in the readme.

For some reason, --remove-needed does not seem to work with the first patchelf invocation so I had to do it separately.
Diffstat (limited to 'pkgs/applications/networking/remote/anydesk')
-rw-r--r--pkgs/applications/networking/remote/anydesk/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 82b6614fcb6..573752b5b53 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, makeDesktopItem
 , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg
-, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome
+, lsb-release, freetype, fontconfig, polkit, polkit_gnome
 , pulseaudio }:
 
 let
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
     gnome2.gtkglext libGLU libGL freetype fontconfig
-    pangox_compat polkit polkit_gnome pulseaudio
+    polkit polkit_gnome pulseaudio
   ] ++ (with xorg; [
     libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu
     libXrandr libXtst libXt libICE libSM libXrender
@@ -67,6 +67,11 @@ in stdenv.mkDerivation rec {
       --set-rpath "${stdenv.lib.makeLibraryPath 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 : ${stdenv.lib.makeBinPath [ lsb-release ]}