treewide: drop gnome2.pango alias

This commit is contained in:
Jan Tojnar 2020-10-25 20:38:25 +01:00
parent 626b514139
commit 3825e74193
12 changed files with 31 additions and 31 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2,
{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango,
atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nss
nspr
gtk3-x11
gnome2.pango
pango
atk
cairo
gdk-pixbuf

View File

@ -1,11 +1,11 @@
{ stdenv, lib, makeWrapper, fetchurl
, dpkg, wrapGAppsHook, autoPatchelfHook
, gtk3, cairo, gnome2, atk, gdk-pixbuf, glib
, gtk3, cairo, pango, atk, gdk-pixbuf, glib
, at-spi2-atk, dbus, libX11, libxcb, libXi
, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
, nss, nspr, alsaLib, cups, fontconfig, expat
, libudev0-shim, glibc, curl, openssl, libnghttp2, gnome3 }:
, libudev0-shim, glibc, curl, openssl, libnghttp2, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
};
buildInputs = [
gnome3.gsettings_desktop_schemas
gsettings-desktop-schemas
glib
gtk3
cairo
gnome2.pango
pango
atk
gdk-pixbuf
at-spi2-atk

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, binutils, patchelf, makeWrapper
, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype
, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype, pango
, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
stdenv.mkDerivation rec {
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
xorg.libxcb
gdk-pixbuf
glib
gnome2.pango
pango
gnome2.GConf
expat
stdenv.cc.cc.lib

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU
, nvidia_cg_toolkit, zlib, openssl, portaudio
}:
let
@ -10,7 +10,7 @@ let
cairo
libjpeg_original
glib
gnome2.pango
pango
libGLU
nvidia_cg_toolkit
zlib

View File

@ -1,6 +1,6 @@
{ autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook
, at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped
, gdk-pixbuf, glib, gnome2, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg
, gdk-pixbuf, glib, pango, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg
, streamlink }:
let
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
gcc-unwrapped
gdk-pixbuf
glib
gnome2.pango
pango
gtk3-x11
nss
nspr

View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg
, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg
, swingSupport ? true }:
let
@ -16,8 +16,8 @@ let
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk-pixbuf atk
xorg.libXxf86vm alsaLib fontconfig freetype pango
gtk2 cairo gdk-pixbuf atk
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc

View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib
, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib
, swingSupport ? true }:
let
@ -16,8 +16,8 @@ let
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk-pixbuf atk zlib
xorg.libXxf86vm alsaLib fontconfig freetype pango
gtk2 cairo gdk-pixbuf atk zlib
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc

View File

@ -1,5 +1,5 @@
{ stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, gtk2
, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
gdk-pixbuf
glib
gnome2.GConf
gnome2.pango
pango
gtk2
gtk3
gsettings-desktop-schemas

View File

@ -10,7 +10,7 @@
, nss
, nspr
, fontconfig
, gnome2
, pango
, cairo
, expat
, alsaLib
@ -59,7 +59,7 @@ let
freetype
gdk-pixbuf
glib
gnome2.pango
pango
gtk3-x11
gtk2-x11
nspr

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre
, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm
, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm
, llvm, glibmm
}:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg
gnome2.pango lzma nasm llvm glibmm
pango lzma nasm llvm glibmm
];
enableParallelBuilding = true;

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg
, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
, gnome2, gnome3, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
, gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
let
version = "1.22.1";
@ -19,9 +19,9 @@ let
freetype
glib
gnome2.GConf
gnome2.gdk_pixbuf
gnome3.gtk
gnome2.pango
gdk-pixbuf
gtk3
pango
libnotify
libsecret
libuuid
@ -60,7 +60,7 @@ in stdenv.mkDerivation {
inherit src;
buildInputs = [ dpkg wrapGAppsHook gnome3.gtk ];
buildInputs = [ dpkg wrapGAppsHook gtk3 ];
dontUnpack = true;
buildCommand = ''

View File

@ -1,6 +1,6 @@
{ stdenv, lib, makeWrapper, fetchurl,
alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib,
gnome2, gtk2-x11, nspr, nss,
gnome2, pango, gtk2-x11, nspr, nss,
libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes,
libXi, libXrandr, libXrender, libXScrnSaver, libXtst,
libudev0-shim
@ -33,7 +33,7 @@
preFixup = let
libPath = lib.makeLibraryPath [
alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype
gdk-pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib
gdk-pixbuf glib gnome2.GConf pango gtk2-x11 nspr nss stdenv.cc.cc.lib
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXScrnSaver libXtst
];