MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #58214 from worldofpeace/gtk3-take2

Browse source 
treewide: no gnome aliases
This commit is contained in:
worldofpeace 2019-03-24 15:42:31 -04:00 committed by GitHub
commit fc47b4023c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 43 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/parlatype/default.nix
View file

@ -1,4 +1,4 @@
{ 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 }: { 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 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "parlatype"; pname = "parlatype";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome3.gtk gtk3
at-spi2-core at-spi2-core
dbus dbus
gst_all_1.gstreamer gst_all_1.gstreamer

3
pkgs/applications/audio/rhythmbox/default.nix
View file

@ -4,6 +4,7 @@
, perlPackages , perlPackages
, gtk3 , gtk3
, intltool , intltool
, libpeas
, libsoup , libsoup
, gnome3 , gnome3
, totem-pl-parser , totem-pl-parser
@ -48,7 +49,7 @@ in stdenv.mkDerivation rec {
json-glib json-glib
gtk3 gtk3
gnome3.libpeas libpeas
totem-pl-parser totem-pl-parser
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme

4
pkgs/applications/backup/deja-dup/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext { stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext
, gnome3, libnotify, itstool, glib, gtk3, libxml2 , gnome3, libnotify, itstool, glib, gtk3, libxml2
, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook , coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook
, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
, appstream-glib, desktop-file-utils, duplicity , appstream-glib, desktop-file-utils, duplicity
}: }:
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
libnotify gnome3.libpeas glib gtk3 libsecret libnotify libpeas glib gtk3 libsecret
pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror
]; ];

3
pkgs/applications/editors/gnome-builder/default.nix
View file

@ -17,6 +17,7 @@
, json-glib , json-glib
, jsonrpc-glib , jsonrpc-glib
, libdazzle , libdazzle
, libpeas
, libxml2 , libxml2
, meson , meson
, ninja , ninja
@ -64,7 +65,7 @@ in stdenv.mkDerivation {
flatpak flatpak
gnome3.devhelp gnome3.devhelp
libgit2-glib libgit2-glib
gnome3.libpeas libpeas
vte vte
gspell gspell
gtk3 gtk3

10
pkgs/applications/editors/jucipp/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, gnome3, at-spi2-core, { stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
with stdenv.lib; with stdenv.lib;
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
dbus dbus
openssl openssl
libxml2 libxml2
gnome3.gtksourceview gtksourceview3
at-spi2-core at-spi2-core
pcre pcre
epoxy epoxy
@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
aspell aspell
libgit2 libgit2
libxkbcommon libxkbcommon
gnome3.gtkmm3 gtkmm3
libpthreadstubs libpthreadstubs
gnome3.gtksourceviewmm gtksourceviewmm
llvmPackages.clang.cc llvmPackages.clang.cc
llvmPackages.lldb llvmPackages.lldb
gnome3.dconf gnome3.dconf

8
pkgs/applications/misc/gImageReader/default.nix
View file

@ -7,7 +7,7 @@
# Gtk deps # Gtk deps
# upstream gImagereader supports Qt too # upstream gImagereader supports Qt too
, gtk3, gobject-introspection, wrapGAppsHook , gtk3, gobject-introspection, wrapGAppsHook
, gnome3, gtkspell3, gtkspellmm, cairomm , gnome3, gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm
}: }:
let let
@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
poppler poppler
# Gtk specific # Gtk specific
gnome3.gtkmm gtkmm3
gtkspell3 gtkspell3
gtkspellmm gtkspellmm
gnome3.gtksourceview gtksourceview3
gnome3.gtksourceviewmm gtksourceviewmm
cairomm cairomm
json-glib json-glib
]; ];

4
pkgs/applications/office/autokey/default.nix
View file

@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection { lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection
, gnome3, libappindicator-gtk3, libnotify }: , gtksourceview3, libappindicator-gtk3, libnotify }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "autokey-${version}"; name = "autokey-${version}";
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
# Note: no dependencies included for Qt GUI because Qt ui is poorly # Note: no dependencies included for Qt GUI because Qt ui is poorly
# maintained—see https://github.com/autokey/autokey/issues/51 # maintained—see https://github.com/autokey/autokey/issues/51
buildInputs = [ wrapGAppsHook gobject-introspection gnome3.gtksourceview buildInputs = [ wrapGAppsHook gobject-introspection gtksourceview3
libappindicator-gtk3 libnotify ]; libappindicator-gtk3 libnotify ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

20
pkgs/applications/video/bombono/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons, { stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, gtkmm2, scons,
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg, mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
enca, pkgconfig, fetchpatch }: enca, pkgconfig, fetchpatch }:
@ -18,20 +18,20 @@ stdenv.mkDerivation rec {
}; };
patches = map fetchPatchFromAur [ patches = map fetchPatchFromAur [
{name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
{name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
{name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
{name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
{name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
{name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
{name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
{name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
]; ];
nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
buildInputs = [ buildInputs = [
gtk2 gnome2.gtkmm mjpegtools libdvdread dvdauthor boost dvdplusrwtools gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools
libxmlxx ffmpeg enca libxmlxx ffmpeg enca
]; ];

4
pkgs/applications/video/subtitleeditor/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
desktop-file-utils, enchant, gnome3, gtk3, gst_all_1, hicolor-icon-theme, desktop-file-utils, enchant, gnome3, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme,
libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
}: }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
desktop-file-utils desktop-file-utils
enchant enchant
gtk3 gtk3
gnome3.gtkmm gtkmm3
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gstreamermm gst_all_1.gstreamermm
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base

4
pkgs/desktops/deepin/deepin-metacity/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, bamf, { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, libgtop, 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 }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gnome3.dconf gnome3.dconf
gtk3 gtk3
gnome3.libgtop libgtop
gnome3.zenity gnome3.zenity
bamf bamf
json-glib json-glib

4
pkgs/desktops/mate/eom/default.nix
View file

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

4
pkgs/desktops/mate/mate-applets/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, gtksourceview3, 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}";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
gnome3.gtksourceview gtksourceview3
gnome3.gucharmap gnome3.gucharmap
libwnck3 libwnck3
libgtop libgtop

6
pkgs/desktops/mate/pluma/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pluma-${version}"; name = "pluma-${version}";
@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
enchant enchant
libxml2 libxml2
python python
gnome3.gtksourceview gtksourceview3
gnome3.libpeas libpeas
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
mate.mate-desktop mate.mate-desktop
]; ];

4
pkgs/development/libraries/aravis/default.nix
View file

@ -7,6 +7,7 @@
, gst-plugins-bad ? null , gst-plugins-bad ? null
, libnotify ? null , libnotify ? null
, gnome3 ? null , gnome3 ? null
, gtk3 ? null
, enableUsb ? true , enableUsb ? true
, enablePacketSocket ? true , enablePacketSocket ? true
, enableViewer ? true , enableViewer ? true
@ -26,6 +27,7 @@ in
assert enableViewer -> enableGstPlugin; assert enableViewer -> enableGstPlugin;
assert enableViewer -> libnotify != null; assert enableViewer -> libnotify != null;
assert enableViewer -> gnome3 != null; assert enableViewer -> gnome3 != null;
assert enableViewer -> gtk3 != null;
assert enableViewer -> gstreamerAtLeastVersion1; assert enableViewer -> gstreamerAtLeastVersion1;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -54,7 +56,7 @@ in
++ stdenv.lib.optional enableUsb libusb ++ stdenv.lib.optional enableUsb libusb
++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optional enablePacketSocket audit
++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ]; ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
preAutoreconf = ''./autogen.sh''; preAutoreconf = ''./autogen.sh'';