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

treewide: drop gnome2.pango alias

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/blockchains/exodus/default.nix
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, atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nss nss
nspr nspr
gtk3-x11 gtk3-x11
gnome2.pango pango
atk atk
cairo cairo
gdk-pixbuf gdk-pixbuf

8
pkgs/applications/misc/polar-bookshelf/default.nix
View File

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

4
pkgs/applications/networking/mailreaders/inboxer/default.nix
View File

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

4
pkgs/applications/video/lightworks/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv { 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 , nvidia_cg_toolkit, zlib, openssl, portaudio
}: }:
let let
@ -10,7 +10,7 @@ let
cairo cairo
libjpeg_original libjpeg_original
glib glib
gnome2.pango pango
libGLU libGLU
nvidia_cg_toolkit nvidia_cg_toolkit
zlib zlib

4
pkgs/applications/video/streamlink-twitch-gui/bin.nix
View File

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

6
pkgs/development/compilers/zulu/8.nix
View File

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

6
pkgs/development/compilers/zulu/default.nix
View File

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

4
pkgs/development/web/insomnia/default.nix
View File

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

4
pkgs/games/minecraft/default.nix
View File

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

4
pkgs/misc/lightspark/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre { 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 , llvm, glibmm
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg 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; enableParallelBuilding = true;

10
pkgs/tools/misc/mongodb-compass/default.nix
View File

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

4
pkgs/tools/misc/sweep-visualizer/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, makeWrapper, fetchurl, { stdenv, lib, makeWrapper, fetchurl,
alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, 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, libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes,
libXi, libXrandr, libXrender, libXScrnSaver, libXtst, libXi, libXrandr, libXrender, libXScrnSaver, libXtst,
libudev0-shim libudev0-shim
@ -33,7 +33,7 @@
preFixup = let preFixup = let
libPath = lib.makeLibraryPath [ libPath = lib.makeLibraryPath [
alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype 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 libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXScrnSaver libXtst libXi libXrandr libXrender libXScrnSaver libXtst
]; ];