git.iko.soy/typeable/nixpkgs
on master help sign in
gnome3.gtk -> gtk3

fix evaluation when config.allowAliases == false (regression after #55735)

commit2be90ccb4faa99a2a8d71e21fa7090a3bc89c263 authorvolth <volth@volth.com> dateSat 9 Mar 2019, 11:41 (8 years ago) parent5bf6a13
24 files changed+53−55
pkgs/applications/audio/reaper/default.nix+2−2 pkgs/applications/misc/gxmessage/default.nix+2−2 pkgs/applications/search/catfish/default.nix+2−2 pkgs/applications/video/lightworks/default.nix+3−3 pkgs/applications/video/subtitleeditor/default.nix+2−2 pkgs/desktops/deepin/deepin-metacity/default.nix+2−2 pkgs/desktops/deepin/deepin-mutter/default.nix+2−2 pkgs/desktops/mate/engrampa/default.nix+2−2 pkgs/desktops/mate/eom/default.nix+2−2 pkgs/desktops/mate/marco/default.nix+3−3 pkgs/desktops/mate/mate-applets/default.nix+3−3 pkgs/desktops/mate/mate-control-center/default.nix+2−2 pkgs/desktops/mate/mate-desktop/default.nix+2−2 pkgs/desktops/mate/mate-media/default.nix+2−2 pkgs/desktops/mate/mate-notification-daemon/default.nix+2−2 pkgs/desktops/mate/mate-panel/default.nix+2−2 pkgs/desktops/mate/mate-power-manager/default.nix+2−2 pkgs/desktops/mate/mate-settings-daemon/default.nix+3−4 pkgs/development/libraries/tepl/default.nix+2−2 pkgs/development/python-modules/xdot/default.nix+2−2 pkgs/tools/audio/gvolicon/default.nix+2−2 pkgs/tools/graphics/luxcorerender/default.nix+2−2 pkgs/tools/networking/network-manager/strongswan.nix+2−3 pkgs/tools/networking/uget/default.nix+3−3
pkgs/applications/audio/reaper/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, autoPatchelfHook, makeWrapper
22, alsaLib, xorg
3−, gnome3, pango, gdk_pixbuf, cairo, glib, freetype
3+, gnome3, gtk3, pango, gdk_pixbuf, cairo, glib, freetype
44, libpulseaudio, xdg_utils
55}:
66
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 ];
3232
3333 runtimeDependencies = [
34− gnome3.gtk
34+ gtk3
3535 ];
3636
3737 dontBuild = true;
pkgs/applications/misc/gxmessage/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
1+{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
22
33stdenv.mkDerivation rec {
44 name = "gxmessage-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
13− buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ];
13+ buildInputs = [ intltool gtk3 texinfo hicolor-icon-theme ];
1414
1515 meta = {
1616 description = "A GTK enabled dropin replacement for xmessage";
pkgs/applications/search/catfish/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, file, which, intltool, gobject-introspection,
2− findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme,
2+ findutils, xdg_utils, gnome3, gtk3, pythonPackages, hicolor-icon-theme,
33 wrapGAppsHook
44}:
55
@@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
2424 ];
2525
2626 buildInputs = [
27− gnome3.gtk
27+ gtk3
2828 gnome3.dconf
2929 pythonPackages.pyxdg
3030 pythonPackages.ptyprocess
pkgs/applications/video/lightworks/default.nix+3−3
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
2−, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
2+, gnome3, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
33, nvidia_cg_toolkit, zlib, openssl, portaudio
44}:
55let
66 fullPath = stdenv.lib.makeLibraryPath [
77 stdenv.cc.cc
8− gnome3.gtk
8+ gtk3
99 gdk_pixbuf
1010 cairo
1111 libjpeg_original
@@ -21,7 +21,7 @@ let
2121 lightworks = stdenv.mkDerivation rec {
2222 version = "14.0.0";
2323 name = "lightworks-${version}";
24−
24+
2525 src =
2626 if stdenv.hostPlatform.system == "x86_64-linux" then
2727 fetchurl {
pkgs/applications/video/subtitleeditor/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
2− desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme,
2+ desktop-file-utils, enchant, gnome3, gtk3, gst_all_1, hicolor-icon-theme,
33 libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
44}:
55
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 buildInputs = [
2929 desktop-file-utils
3030 enchant
31− gnome3.gtk
31+ gtk3
3232 gnome3.gtkmm
3333 gst_all_1.gstreamer
3434 gst_all_1.gstreamermm
pkgs/desktops/deepin/deepin-metacity/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf,
1+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, bamf,
22 json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
33 deepin-wallpapers, deepin-desktop-schemas, deepin }:
44
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 buildInputs = [
2626 gnome3.dconf
27− gnome3.gtk
27+ gtk3
2828 gnome3.libgtop
2929 gnome3.zenity
3030 bamf
pkgs/desktops/deepin/deepin-mutter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg,
1+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, xorg,
22 libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
33 libstartup_notification, libinput, cogl, clutter, systemd, deepin }:
44
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 ];
2323
2424 buildInputs = [
25− gnome3.gtk
25+ gtk3
2626 gnome3.gnome-desktop
2727 gnome3.gsettings-desktop-schemas
2828 gnome3.libgudev
pkgs/desktops/mate/engrampa/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "engrampa-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 buildInputs = [
2020 libxml2
21− gnome3.gtk
21+ gtk3
2222 mate.caja
2323 hicolor-icon-theme
2424 mate.mate-desktop
pkgs/desktops/mate/eom/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "eom-${version}";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 librsvg
2626 libxml2
2727 shared-mime-info
28− gnome3.gtk
28+ gtk3
2929 gnome3.libpeas
3030 mate.mate-desktop
3131 hicolor-icon-theme
pkgs/desktops/mate/marco/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, gtk3, mate, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "marco-${version}";
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
2121 libcanberra-gtk3
2222 libgtop
2323 gnome2.startup_notification
24− gnome3.gtk
24+ gtk3
2525 gnome3.zenity
2626 ];
27−
27+
2828 meta = with stdenv.lib; {
2929 description = "MATE default window manager";
3030 homepage = https://github.com/mate-desktop/marco;
pkgs/desktops/mate/mate-applets/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "mate-applets-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 ];
1818
1919 buildInputs = [
20− gnome3.gtk
20+ gtk3
2121 gnome3.gtksourceview
2222 gnome3.gucharmap
2323 libwnck3
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 ];
3434
3535 configureFlags = [ "--enable-suid=no" ];
36−
36+
3737 NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
3838
3939 meta = with stdenv.lib; {
pkgs/desktops/mate/mate-control-center/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
22 libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
3− desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook
3+ desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
44}:
55
66stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 libcanberra-gtk3
2828 librsvg
2929 libappindicator-gtk3
30− gnome3.gtk
30+ gtk3
3131 gnome3.dconf
3232 hicolor-icon-theme
3333 mate.mate-desktop
pkgs/desktops/mate/mate-desktop/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, gnome3, mate, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, gtk3, mate, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "mate-desktop-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 buildInputs = [
1919 gnome3.dconf
20− gnome3.gtk
20+ gtk3
2121 ];
2222
2323 meta = with stdenv.lib; {
pkgs/desktops/mate/mate-media/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, gtk3, mate, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "mate-media-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 buildInputs = [
1313 libxml2
1414 libcanberra-gtk3
15− gnome3.gtk
15+ gtk3
1616 mate.libmatemixer
1717 mate.mate-desktop
1818 ];
pkgs/desktops/mate/mate-notification-daemon/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3,
2− libnotify, libwnck3, gnome3, mate, wrapGAppsHook }:
2+ libnotify, libwnck3, gnome3, gtk3, mate, wrapGAppsHook }:
33
44stdenv.mkDerivation rec {
55 name = "mate-notification-daemon-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 libcanberra-gtk3
2222 libnotify
2323 libwnck3
24− gnome3.gtk
24+ gtk3
2525 ];
2626
2727 meta = with stdenv.lib; {
pkgs/desktops/mate/mate-panel/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "mate-panel-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 libwnck3
2424 librsvg
2525 libxml2
26− gnome3.gtk
26+ gtk3
2727 gnome3.dconf
2828 mate.libmateweather
2929 mate.mate-desktop
pkgs/desktops/mate/mate-power-manager/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "mate-power-manager-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 itstool
1515 libxml2
1616 libcanberra-gtk3
17− gnome3.gtk
17+ gtk3
1818 gnome3.libgnome-keyring
1919 libnotify
2020 dbus-glib
pkgs/desktops/mate/mate-settings-daemon/default.nix+3−4
@@ -1,6 +1,5 @@
1−{ config, stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier
2−, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook
3−, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
1+{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate, wrapGAppsHook
2+, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
43}:
54
65stdenv.mkDerivation rec {
@@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
2524 libnotify
2625 nss
2726 polkit
28− gnome3.gtk
27+ gtk3
2928 gnome3.dconf
3029 mate.mate-desktop
3130 mate.libmatekbd
pkgs/development/libraries/tepl/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl
2−, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
2+, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
33let
44 version = "4.2.0";
55 pname = "tepl";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
2020 libxml2
2121 gtksourceview4
2222 libuchardet
23− gnome3.gtk
23+ gtk3
2424 ];
2525
2626 doCheck = false;
pkgs/development/python-modules/xdot/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, buildPythonPackage, fetchPypi, isPy3k
2−, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3 }:
2+, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3, gtk3 }:
33
44buildPythonPackage rec {
55 pname = "xdot";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
1313 disabled = !isPy3k;
1414
1515 nativeBuildInputs = [ wrapGAppsHook ];
16− propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gnome3.gtk ];
16+ propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ];
1717
1818 meta = with lib; {
1919 description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
pkgs/tools/audio/gvolicon/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
1+{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
22
33stdenv.mkDerivation {
44 name = "gvolicon-2014-04-28";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010
1111 nativeBuildInputs = [ pkgconfig ];
1212 buildInputs = [
13− makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme
13+ makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme
1414 librsvg wrapGAppsHook
1515 ];
1616
pkgs/tools/graphics/luxcorerender/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
22, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
33, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
4−, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre
4+, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre
55, bison, flex, libpthreadstubs, libX11
66, embree2, makeWrapper, gsettings-desktop-schemas, glib
77, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
3131 flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
3232 epoxy at-spi2-core dbus doxygen
3333 # needed for GSETTINGS_SCHEMAS_PATH
34− gsettings-desktop-schemas glib gnome3.gtk
34+ gsettings-desktop-schemas glib gtk3
3535 # needed for XDG_ICON_DIRS
3636 gnome3.adwaita-icon-theme
3737 makeWrapper
pkgs/tools/networking/network-manager/strongswan.nix+2−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM
2−, gnome3, libsecret }:
2+, gtk3, gnome3, libsecret }:
33
44stdenv.mkDerivation rec {
55 name = "${pname}-${version}";
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd";
1212 };
1313
14− buildInputs = [ networkmanager strongswanNM libsecret ]
15− ++ (with gnome3; [ gtk networkmanagerapplet ]);
14+ buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ];
1615
1716 nativeBuildInputs = [ intltool pkgconfig ];
1817
pkgs/tools/networking/uget/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
2− libappindicator-gtk3, gst_all_1, gnome3, wrapGAppsHook, aria2 ? null
2+ libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null
33}:
44
55stdenv.mkDerivation rec {
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
1616 intltool
1717 wrapGAppsHook
1818 ];
19−
19+
2020 buildInputs = [
2121 openssl
2222 curl
2323 libnotify
2424 libappindicator-gtk3
25− gnome3.gtk
25+ gtk3
2626 (stdenv.lib.getLib gnome3.dconf)
2727 ]
2828 ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])