public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anydesk: remove pangox dependency

Browse Source 
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.
This commit is contained in:
Jan Tojnar 2019-12-24 15:59:35 +01:00
parent eeaf1f702d
commit 6c73f25885
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/remote/anydesk/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem { stdenv, fetchurl, makeWrapper, makeDesktopItem
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg , 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 }: , pulseaudio }:
let let
@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
gnome2.gtkglext libGLU libGL freetype fontconfig gnome2.gtkglext libGLU libGL freetype fontconfig
pangox_compat polkit polkit_gnome pulseaudio polkit polkit_gnome pulseaudio
] ++ (with xorg; [ ] ++ (with xorg; [
libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu
libXrandr libXtst libXt libICE libSM libXrender libXrandr libXtst libXt libICE libSM libXrender
@ -67,6 +67,11 @@ in stdenv.mkDerivation rec {
--set-rpath "${stdenv.lib.makeLibraryPath buildInputs}" \ --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}" \
$out/bin/anydesk $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 \ wrapProgram $out/bin/anydesk \
--prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]} --prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]}