git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #58214 from worldofpeace/gtk3-take2

treewide: no gnome aliases

commitfc47b4023c2e99098cbc395434f9fcfe7a8690ea authorworldofpeace <worldofpeace@users.noreply.github.com> dateSun 24 Mar 2019, 15:42 (8 years ago) parentcf7f23497eb653
14 files changed+43−39
pkgs/applications/audio/parlatype/default.nix+2−2 pkgs/applications/audio/rhythmbox/default.nix+2−1 pkgs/applications/backup/deja-dup/default.nix+2−2 pkgs/applications/editors/gnome-builder/default.nix+2−1 pkgs/applications/editors/jucipp/default.nix+5−5 pkgs/applications/misc/gImageReader/default.nix+4−4 pkgs/applications/office/autokey/default.nix+2−2 pkgs/applications/video/bombono/default.nix+10−10 pkgs/applications/video/subtitleeditor/default.nix+2−2 pkgs/desktops/deepin/deepin-metacity/default.nix+2−2 pkgs/desktops/mate/eom/default.nix+2−2 pkgs/desktops/mate/mate-applets/default.nix+2−2 pkgs/desktops/mate/pluma/default.nix+3−3 pkgs/development/libraries/aravis/default.nix+3−1
pkgs/applications/audio/parlatype/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, meson, gnome3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }:
1+{ stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }:
22
33stdenv.mkDerivation rec {
44 pname = "parlatype";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 ];
2525
2626 buildInputs = [
27− gnome3.gtk
27+ gtk3
2828 at-spi2-core
2929 dbus
3030 gst_all_1.gstreamer
pkgs/applications/audio/rhythmbox/default.nix+2−1
@@ -4,6 +4,7 @@
44, perlPackages
55, gtk3
66, intltool
7+, libpeas
78, libsoup
89, gnome3
910, totem-pl-parser
@@ -48,7 +49,7 @@ in stdenv.mkDerivation rec {
4849 json-glib
4950
5051 gtk3
51− gnome3.libpeas
52+ libpeas
5253 totem-pl-parser
5354 gnome3.adwaita-icon-theme
5455
pkgs/applications/backup/deja-dup/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext
22, gnome3, libnotify, itstool, glib, gtk3, libxml2
3−, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
3+, coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook
44, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
55, appstream-glib, desktop-file-utils, duplicity
66}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 ];
3636
3737 buildInputs = [
38− libnotify gnome3.libpeas glib gtk3 libsecret
38+ libnotify libpeas glib gtk3 libsecret
3939 pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
4040 at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror
4141 ];
pkgs/applications/editors/gnome-builder/default.nix+2−1
@@ -17,6 +17,7 @@
1717, json-glib
1818, jsonrpc-glib
1919, libdazzle
20+, libpeas
2021, libxml2
2122, meson
2223, ninja
@@ -64,7 +65,7 @@ in stdenv.mkDerivation {
6465 flatpak
6566 gnome3.devhelp
6667 libgit2-glib
67− gnome3.libpeas
68+ libpeas
6869 vte
6970 gspell
7071 gtk3
pkgs/applications/editors/jucipp/default.nix+5−5
@@ -1,6 +1,6 @@
1−{ stdenv, fetchgit, gnome3, at-spi2-core,
1+{ stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm,
22 boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
3− libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
3+ libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
44 coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
55
66with stdenv.lib;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 dbus
3030 openssl
3131 libxml2
32− gnome3.gtksourceview
32+ gtksourceview3
3333 at-spi2-core
3434 pcre
3535 epoxy
@@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
3939 aspell
4040 libgit2
4141 libxkbcommon
42− gnome3.gtkmm3
42+ gtkmm3
4343 libpthreadstubs
44− gnome3.gtksourceviewmm
44+ gtksourceviewmm
4545 llvmPackages.clang.cc
4646 llvmPackages.lldb
4747 gnome3.dconf
pkgs/applications/misc/gImageReader/default.nix+4−4
@@ -7,7 +7,7 @@
77# Gtk deps
88# upstream gImagereader supports Qt too
99, gtk3, gobject-introspection, wrapGAppsHook
10−, gnome3, gtkspell3, gtkspellmm, cairomm
10+, gnome3, gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm
1111}:
1212
1313let
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
4848 poppler
4949
5050 # Gtk specific
51− gnome3.gtkmm
51+ gtkmm3
5252 gtkspell3
5353 gtkspellmm
54− gnome3.gtksourceview
55− gnome3.gtksourceviewmm
54+ gtksourceview3
55+ gtksourceviewmm
5656 cairomm
5757 json-glib
5858 ];
pkgs/applications/office/autokey/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection
2−, gnome3, libappindicator-gtk3, libnotify }:
2+, gtksourceview3, libappindicator-gtk3, libnotify }:
33
44python3Packages.buildPythonApplication rec {
55 name = "autokey-${version}";
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
2222 # Note: no dependencies included for Qt GUI because Qt ui is poorly
2323 # maintained—see https://github.com/autokey/autokey/issues/51
2424
25− buildInputs = [ wrapGAppsHook gobject-introspection gnome3.gtksourceview
25+ buildInputs = [ wrapGAppsHook gobject-introspection gtksourceview3
2626 libappindicator-gtk3 libnotify ];
2727
2828 propagatedBuildInputs = with python3Packages; [
pkgs/applications/video/bombono/default.nix+10−10
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons,
1+{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, gtkmm2, scons,
22mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
33enca, pkgconfig, fetchpatch }:
44
@@ -18,20 +18,20 @@ stdenv.mkDerivation rec {
1818 };
1919
2020 patches = map fetchPatchFromAur [
21− {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
22− {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
23− {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
24− {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
25− {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
26− {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
27− {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
28− {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
21+ {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
22+ {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
23+ {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
24+ {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
25+ {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
26+ {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
27+ {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
28+ {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
2929 ];
3030
3131 nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
3232
3333 buildInputs = [
34− gtk2 gnome2.gtkmm mjpegtools libdvdread dvdauthor boost dvdplusrwtools
34+ gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools
3535 libxmlxx ffmpeg enca
3636 ];
3737
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, gtk3, gst_all_1, hicolor-icon-theme,
2+ desktop-file-utils, enchant, gnome3, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme,
33 libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
44}:
55
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 desktop-file-utils
3030 enchant
3131 gtk3
32− gnome3.gtkmm
32+ gtkmm3
3333 gst_all_1.gstreamer
3434 gst_all_1.gstreamermm
3535 gst_all_1.gst-plugins-base
pkgs/desktops/deepin/deepin-metacity/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, bamf,
1+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, libgtop, bamf,
22 json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
33 deepin-wallpapers, deepin-desktop-schemas, deepin }:
44
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 buildInputs = [
2626 gnome3.dconf
2727 gtk3
28− gnome3.libgtop
28+ libgtop
2929 gnome3.zenity
3030 bamf
3131 json-glib
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, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "eom-${version}";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 libxml2
2727 shared-mime-info
2828 gtk3
29− gnome3.libpeas
29+ libpeas
3030 mate.mate-desktop
3131 hicolor-icon-theme
3232 ];
pkgs/desktops/mate/mate-applets/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "mate-applets-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 buildInputs = [
2020 gtk3
21− gnome3.gtksourceview
21+ gtksourceview3
2222 gnome3.gucharmap
2323 libwnck3
2424 libgtop
pkgs/desktops/mate/pluma/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }:
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "pluma-${version}";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 enchant
2222 libxml2
2323 python
24− gnome3.gtksourceview
25− gnome3.libpeas
24+ gtksourceview3
25+ libpeas
2626 gnome3.adwaita-icon-theme
2727 mate.mate-desktop
2828 ];
pkgs/development/libraries/aravis/default.nix+3−1
@@ -7,6 +7,7 @@
77, gst-plugins-bad ? null
88, libnotify ? null
99, gnome3 ? null
10+, gtk3 ? null
1011, enableUsb ? true
1112, enablePacketSocket ? true
1213, enableViewer ? true
@@ -26,6 +27,7 @@ in
2627 assert enableViewer -> enableGstPlugin;
2728 assert enableViewer -> libnotify != null;
2829 assert enableViewer -> gnome3 != null;
30+ assert enableViewer -> gtk3 != null;
2931 assert enableViewer -> gstreamerAtLeastVersion1;
3032
3133 stdenv.mkDerivation rec {
@@ -54,7 +56,7 @@ in
5456 ++ stdenv.lib.optional enableUsb libusb
5557 ++ stdenv.lib.optional enablePacketSocket audit
5658 ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
57− ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ];
59+ ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
5860
5961 preAutoreconf = ''./autogen.sh'';
6062