Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkgs/applications/networking/remote/anydesk/default.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 ]}

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/science/misc/openmodelica/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which,
lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }:
doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }:

let

Expand All @@ -17,7 +17,7 @@ stdenv.mkDerivation {
buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkitgtk which
lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu
doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu
git gtk2 makeWrapper];

hardeningDisable = [ "format" ];
Expand Down
21 changes: 0 additions & 21 deletions pkgs/development/libraries/pangox-compat/default.nix

This file was deleted.

2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11671,8 +11671,6 @@ in
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};

pangox_compat = callPackage ../development/libraries/pangox-compat { };

gdata-sharp = callPackage ../development/libraries/gdata-sharp { };

gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
Expand Down