treewide: gnome2.gtk -> gtk2

Fix building with `config.allowAliases = false;`.
This commit is contained in:
Samuel Gräfenstein 2021-03-16 18:22:15 +01:00
parent 703a406181
commit b72ee5775c
No known key found for this signature in database
GPG Key ID: EF76A063F15C63C8
8 changed files with 18 additions and 16 deletions

View File

@ -4,7 +4,7 @@
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
, traySupport ? true, gnome2 ? null
, traySupport ? true, gtk2 ? null
, pgpSupport ? true, gpgme ? null
, pythonPluginSupport ? true, python ? null
, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null
@ -12,7 +12,7 @@
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk-pixbuf != null;
assert traySupport -> gnome2 != null;
assert traySupport -> gtk2 != null;
assert pgpSupport -> gpgme != null;
assert pythonPluginSupport -> python != null;
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
curl libmesode cmocka libmicrohttpd sqlite
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk-pixbuf ]
++ optionals traySupport [ gnome2.gtk ]
++ optionals traySupport [ gtk2 ]
++ optionals pgpSupport [ gpgme ]
++ optionals pythonPluginSupport [ python ]
++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ];

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
, freetype, gdk-pixbuf, glib, gnome2, gtk2, nspr, nss, pango, udev, xorg }:
let
fullPath = lib.makeLibraryPath [
alsaLib
@ -13,7 +13,7 @@ let
gdk-pixbuf
glib
gnome2.GConf
gnome2.gtk
gtk2
nspr
nss
pango

View File

@ -5,6 +5,7 @@
, pkg-config
, autoreconfHook
, gnome2
, gtk2
, glib
, libtifiles2
, libticables2
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gnome2.gtk
gtk2
gnome2.libglade
glib
libtifiles2

View File

@ -7,6 +7,7 @@
, intltool
, glib
, gnome2
, gtk2
, gfm
, libticables2
, libticalcs2
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
gnome2.gtk
gtk2
gnome2.libglade
gfm
libticables2

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, makeWrapper, pkg-config,
gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
gnome2, gtk2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
configH ? ""
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation {
};
buildInputs = [
gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11
gnome2.vte glib pango gtk2 cairo gdk-pixbuf atk freetype xorg.libX11
xorg.xorgproto xorg.libXext makeWrapper pkg-config
];

View File

@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, pkg-config, libtool
, zip, libffi, libsigsegv, readline, gmp
, gnutls, gnome2, cairo, SDL, sqlite
, gnutls, gtk2, cairo, SDL, sqlite
, emacsSupport ? config.emacsSupport or false, emacs ? null }:
assert emacsSupport -> (emacs != null);
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
# http://smalltalk.gnu.org/download
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
libtool zip libffi libsigsegv-shared readline gmp gnutls gtk2
cairo SDL sqlite
]
++ lib.optional emacsSupport emacs;

View File

@ -3,7 +3,7 @@
, lib
, pkg-config
, glib
, gnome2
, gtk2
, libticonv
, libtifiles2
, libticables2
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ];
buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ];
NIX_CFLAGS_COMPILE = [ "-lm" ];
meta = with lib; {
homepage = "http://lpg.ticalc.org/prj_tilem/";

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2,
fftw, gsl, goffice, libgsf }:
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2
, fftw, gsl, goffice, libgsf }:
stdenv.mkDerivation rec {
pname = "nip2";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkg-config glib libxml2 flex bison vips
gnome2.gtk fftw gsl goffice libgsf
gtk2 fftw gsl goffice libgsf
];
meta = with lib; {