treewide: gnome2.gtk -> gtk2
Fix building with `config.allowAliases = false;`.
This commit is contained in:
parent
703a406181
commit
b72ee5775c
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
|
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
|
||||||
, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
|
, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
|
||||||
, traySupport ? true, gnome2 ? null
|
, traySupport ? true, gtk2 ? null
|
||||||
, pgpSupport ? true, gpgme ? null
|
, pgpSupport ? true, gpgme ? null
|
||||||
, pythonPluginSupport ? true, python ? null
|
, pythonPluginSupport ? true, python ? null
|
||||||
, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null
|
, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
|
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
|
||||||
assert notifySupport -> libnotify != null && gdk-pixbuf != null;
|
assert notifySupport -> libnotify != null && gdk-pixbuf != null;
|
||||||
assert traySupport -> gnome2 != null;
|
assert traySupport -> gtk2 != null;
|
||||||
assert pgpSupport -> gpgme != null;
|
assert pgpSupport -> gpgme != null;
|
||||||
assert pythonPluginSupport -> python != null;
|
assert pythonPluginSupport -> python != null;
|
||||||
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
|
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
|
||||||
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||||
curl libmesode cmocka libmicrohttpd sqlite
|
curl libmesode cmocka libmicrohttpd sqlite
|
||||||
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
|
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
|
||||||
++ optionals notifySupport [ libnotify gdk-pixbuf ]
|
++ optionals notifySupport [ libnotify gdk-pixbuf ]
|
||||||
++ optionals traySupport [ gnome2.gtk ]
|
++ optionals traySupport [ gtk2 ]
|
||||||
++ optionals pgpSupport [ gpgme ]
|
++ optionals pgpSupport [ gpgme ]
|
||||||
++ optionals pythonPluginSupport [ python ]
|
++ optionals pythonPluginSupport [ python ]
|
||||||
++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ];
|
++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ];
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
|
{ 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
|
let
|
||||||
fullPath = lib.makeLibraryPath [
|
fullPath = lib.makeLibraryPath [
|
||||||
alsaLib
|
alsaLib
|
||||||
|
@ -13,7 +13,7 @@ let
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
glib
|
glib
|
||||||
gnome2.GConf
|
gnome2.GConf
|
||||||
gnome2.gtk
|
gtk2
|
||||||
nspr
|
nspr
|
||||||
nss
|
nss
|
||||||
pango
|
pango
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, gnome2
|
, gnome2
|
||||||
|
, gtk2
|
||||||
, glib
|
, glib
|
||||||
, libtifiles2
|
, libtifiles2
|
||||||
, libticables2
|
, libticables2
|
||||||
|
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gnome2.gtk
|
gtk2
|
||||||
gnome2.libglade
|
gnome2.libglade
|
||||||
glib
|
glib
|
||||||
libtifiles2
|
libtifiles2
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
, intltool
|
, intltool
|
||||||
, glib
|
, glib
|
||||||
, gnome2
|
, gnome2
|
||||||
|
, gtk2
|
||||||
, gfm
|
, gfm
|
||||||
, libticables2
|
, libticables2
|
||||||
, libticalcs2
|
, libticalcs2
|
||||||
|
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib
|
glib
|
||||||
gnome2.gtk
|
gtk2
|
||||||
gnome2.libglade
|
gnome2.libglade
|
||||||
gfm
|
gfm
|
||||||
libticables2
|
libticables2
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchgit, makeWrapper, pkg-config,
|
{ 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 ? ""
|
configH ? ""
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
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
|
xorg.xorgproto xorg.libXext makeWrapper pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ config, lib, stdenv, fetchurl, pkg-config, libtool
|
{ config, lib, stdenv, fetchurl, pkg-config, libtool
|
||||||
, zip, libffi, libsigsegv, readline, gmp
|
, zip, libffi, libsigsegv, readline, gmp
|
||||||
, gnutls, gnome2, cairo, SDL, sqlite
|
, gnutls, gtk2, cairo, SDL, sqlite
|
||||||
, emacsSupport ? config.emacsSupport or false, emacs ? null }:
|
, emacsSupport ? config.emacsSupport or false, emacs ? null }:
|
||||||
|
|
||||||
assert emacsSupport -> (emacs != null);
|
assert emacsSupport -> (emacs != null);
|
||||||
|
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
|
||||||
# http://smalltalk.gnu.org/download
|
# http://smalltalk.gnu.org/download
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
|
libtool zip libffi libsigsegv-shared readline gmp gnutls gtk2
|
||||||
cairo SDL sqlite
|
cairo SDL sqlite
|
||||||
]
|
]
|
||||||
++ lib.optional emacsSupport emacs;
|
++ lib.optional emacsSupport emacs;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
, lib
|
, lib
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, glib
|
, glib
|
||||||
, gnome2
|
, gtk2
|
||||||
, libticonv
|
, libticonv
|
||||||
, libtifiles2
|
, libtifiles2
|
||||||
, libticables2
|
, libticables2
|
||||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw";
|
sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw";
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ];
|
buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ];
|
||||||
NIX_CFLAGS_COMPILE = [ "-lm" ];
|
NIX_CFLAGS_COMPILE = [ "-lm" ];
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://lpg.ticalc.org/prj_tilem/";
|
homepage = "http://lpg.ticalc.org/prj_tilem/";
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2,
|
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2
|
||||||
fftw, gsl, goffice, libgsf }:
|
, fftw, gsl, goffice, libgsf }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nip2";
|
pname = "nip2";
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ pkg-config glib libxml2 flex bison vips
|
[ pkg-config glib libxml2 flex bison vips
|
||||||
gnome2.gtk fftw gsl goffice libgsf
|
gtk2 fftw gsl goffice libgsf
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in New Issue