Merge pull request #76412 from jtojnar/pangox-compat-drop

pangox_compat: drop
This commit is contained in:
Jan Tojnar 2019-12-24 20:04:10 +01:00 committed by GitHub
commit b1b26f8cf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 27 deletions

View file

@ -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 ]}

View file

@ -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
@ -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" ];

View file

@ -1,21 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, pango, libX11 }:
stdenv.mkDerivation rec {
pname = "pangox-compat";
version = "0.0.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib pango libX11 ];
meta = {
description = "A compatibility library for pango>1.30.*";
homepage = "https://gitlab.gnome.org/Archive/pangox-compat";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -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 { };