gnome3.gtk -> gtk3

fix evaluation when config.allowAliases == false

(regression after #55735)
This commit is contained in:
volth 2019-03-09 11:41:12 +00:00 committed by worldofpeace
parent 5bf6a13417
commit 2be90ccb4f
24 changed files with 53 additions and 55 deletions

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoPatchelfHook, makeWrapper { stdenv, fetchurl, autoPatchelfHook, makeWrapper
, alsaLib, xorg , alsaLib, xorg
, gnome3, pango, gdk_pixbuf, cairo, glib, freetype , gnome3, gtk3, pango, gdk_pixbuf, cairo, glib, freetype
, libpulseaudio, xdg_utils , libpulseaudio, xdg_utils
}: }:
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
]; ];
runtimeDependencies = [ runtimeDependencies = [
gnome3.gtk gtk3
]; ];
dontBuild = true; dontBuild = true;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: { stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gxmessage-${version}"; name = "gxmessage-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ]; buildInputs = [ intltool gtk3 texinfo hicolor-icon-theme ];
meta = { meta = {
description = "A GTK enabled dropin replacement for xmessage"; description = "A GTK enabled dropin replacement for xmessage";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, file, which, intltool, gobject-introspection, { stdenv, fetchurl, file, which, intltool, gobject-introspection,
findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme, findutils, xdg_utils, gnome3, gtk3, pythonPackages, hicolor-icon-theme,
wrapGAppsHook wrapGAppsHook
}: }:
@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
]; ];
buildInputs = [ buildInputs = [
gnome3.gtk gtk3
gnome3.dconf gnome3.dconf
pythonPackages.pyxdg pythonPackages.pyxdg
pythonPackages.ptyprocess pythonPackages.ptyprocess

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv { stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU , gnome3, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
, nvidia_cg_toolkit, zlib, openssl, portaudio , nvidia_cg_toolkit, zlib, openssl, portaudio
}: }:
let let
fullPath = stdenv.lib.makeLibraryPath [ fullPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc stdenv.cc.cc
gnome3.gtk gtk3
gdk_pixbuf gdk_pixbuf
cairo cairo
libjpeg_original libjpeg_original
@ -21,7 +21,7 @@ let
lightworks = stdenv.mkDerivation rec { lightworks = stdenv.mkDerivation rec {
version = "14.0.0"; version = "14.0.0";
name = "lightworks-${version}"; name = "lightworks-${version}";
src = src =
if stdenv.hostPlatform.system == "x86_64-linux" then if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl { fetchurl {

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme, desktop-file-utils, enchant, gnome3, gtk3, gst_all_1, hicolor-icon-theme,
libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
}: }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
desktop-file-utils desktop-file-utils
enchant enchant
gnome3.gtk gtk3
gnome3.gtkmm gnome3.gtkmm
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gstreamermm gst_all_1.gstreamermm

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf, { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, bamf,
json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
deepin-wallpapers, deepin-desktop-schemas, deepin }: deepin-wallpapers, deepin-desktop-schemas, deepin }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gnome3.dconf gnome3.dconf
gnome3.gtk gtk3
gnome3.libgtop gnome3.libgtop
gnome3.zenity gnome3.zenity
bamf bamf

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, xorg,
libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
libstartup_notification, libinput, cogl, clutter, systemd, deepin }: libstartup_notification, libinput, cogl, clutter, systemd, deepin }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome3.gtk gtk3
gnome3.gnome-desktop gnome3.gnome-desktop
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas
gnome3.libgudev gnome3.libgudev

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "engrampa-${version}"; name = "engrampa-${version}";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libxml2 libxml2
gnome3.gtk gtk3
mate.caja mate.caja
hicolor-icon-theme hicolor-icon-theme
mate.mate-desktop mate.mate-desktop

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "eom-${version}"; name = "eom-${version}";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
librsvg librsvg
libxml2 libxml2
shared-mime-info shared-mime-info
gnome3.gtk gtk3
gnome3.libpeas gnome3.libpeas
mate.mate-desktop mate.mate-desktop
hicolor-icon-theme hicolor-icon-theme

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "marco-${version}"; name = "marco-${version}";
@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
libcanberra-gtk3 libcanberra-gtk3
libgtop libgtop
gnome2.startup_notification gnome2.startup_notification
gnome3.gtk gtk3
gnome3.zenity gnome3.zenity
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE default window manager"; description = "MATE default window manager";
homepage = https://github.com/mate-desktop/marco; homepage = https://github.com/mate-desktop/marco;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-applets-${version}"; name = "mate-applets-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome3.gtk gtk3
gnome3.gtksourceview gnome3.gtksourceview
gnome3.gucharmap gnome3.gucharmap
libwnck3 libwnck3
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
]; ];
configureFlags = [ "--enable-suid=no" ]; configureFlags = [ "--enable-suid=no" ];
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
libcanberra-gtk3 libcanberra-gtk3
librsvg librsvg
libappindicator-gtk3 libappindicator-gtk3
gnome3.gtk gtk3
gnome3.dconf gnome3.dconf
hicolor-icon-theme hicolor-icon-theme
mate.mate-desktop mate.mate-desktop

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, gnome3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-desktop-${version}"; name = "mate-desktop-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gnome3.dconf gnome3.dconf
gnome3.gtk gtk3
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-media-${version}"; name = "mate-media-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libxml2 libxml2
libcanberra-gtk3 libcanberra-gtk3
gnome3.gtk gtk3
mate.libmatemixer mate.libmatemixer
mate.mate-desktop mate.mate-desktop
]; ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3, { stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3,
libnotify, libwnck3, gnome3, mate, wrapGAppsHook }: libnotify, libwnck3, gnome3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-notification-daemon-${version}"; name = "mate-notification-daemon-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
libcanberra-gtk3 libcanberra-gtk3
libnotify libnotify
libwnck3 libwnck3
gnome3.gtk gtk3
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-panel-${version}"; name = "mate-panel-${version}";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
libwnck3 libwnck3
librsvg librsvg
libxml2 libxml2
gnome3.gtk gtk3
gnome3.dconf gnome3.dconf
mate.libmateweather mate.libmateweather
mate.mate-desktop mate.mate-desktop

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-power-manager-${version}"; name = "mate-power-manager-${version}";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
itstool itstool
libxml2 libxml2
libcanberra-gtk3 libcanberra-gtk3
gnome3.gtk gtk3
gnome3.libgnome-keyring gnome3.libgnome-keyring
libnotify libnotify
dbus-glib dbus-glib

View file

@ -1,6 +1,5 @@
{ config, stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier { stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate, wrapGAppsHook
, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
libnotify libnotify
nss nss
polkit polkit
gnome3.gtk gtk3
gnome3.dconf gnome3.dconf
mate.mate-desktop mate.mate-desktop
mate.libmatekbd mate.libmatekbd

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }: , amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
let let
version = "4.2.0"; version = "4.2.0";
pname = "tepl"; pname = "tepl";
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
libxml2 libxml2
gtksourceview4 gtksourceview4
libuchardet libuchardet
gnome3.gtk gtk3
]; ];
doCheck = false; doCheck = false;

View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k { lib, buildPythonPackage, fetchPypi, isPy3k
, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3 }: , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3, gtk3 }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "xdot"; pname = "xdot";
@ -13,7 +13,7 @@ buildPythonPackage rec {
disabled = !isPy3k; disabled = !isPy3k;
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gnome3.gtk ]; propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ];
meta = with lib; { meta = with lib; {
description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";

View file

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }: { stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gvolicon-2014-04-28"; name = "gvolicon-2014-04-28";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme
librsvg wrapGAppsHook librsvg wrapGAppsHook
]; ];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre
, bison, flex, libpthreadstubs, libX11 , bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings-desktop-schemas, glib , embree2, makeWrapper, gsettings-desktop-schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
epoxy at-spi2-core dbus doxygen epoxy at-spi2-core dbus doxygen
# needed for GSETTINGS_SCHEMAS_PATH # needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gnome3.gtk gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS # needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
makeWrapper makeWrapper

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM
, gnome3, libsecret }: , gtk3, gnome3, libsecret }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd"; sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd";
}; };
buildInputs = [ networkmanager strongswanNM libsecret ] buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ];
++ (with gnome3; [ gtk networkmanagerapplet ]);
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, { stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
libappindicator-gtk3, gst_all_1, gnome3, wrapGAppsHook, aria2 ? null libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
intltool intltool
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
openssl openssl
curl curl
libnotify libnotify
libappindicator-gtk3 libappindicator-gtk3
gnome3.gtk gtk3
(stdenv.lib.getLib gnome3.dconf) (stdenv.lib.getLib gnome3.dconf)
] ]
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])