diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
commit | 2fcb11a2442b27834db87b2f62511037c31b5e36 (patch) | |
tree | e9d38370aac7632cd35207180dc7c87d2bb6171d /pkgs/applications/networking/mailreaders | |
parent | 456ff62ff820bbb2debd4568a775d88e61fd8bd1 (diff) | |
parent | fc4a8f63c4e46652d484b127162641be36481363 (diff) |
Merge staging-next into master
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
4 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 006684ecc1026..41f3a271a6996 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable +, gtkmm3, libpeas, gsettings-desktop-schemas , makeWrapper, python3, python3Packages , vim ? vim_configurable.override { features = "normal"; @@ -21,10 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas - python3 python3Packages.pygobject3 - notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme - glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); + buildInputs = [ + gtkmm3 gmime3 webkitgtk libsass libpeas + python3 python3Packages.pygobject3 + notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme + glib-networking protobuf + ] ++ (if vim == null then [] else [ vim ]); postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 2b62db069bc9d..6c39dc78e57a5 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec { }; buildInputs = [ - gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer + gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ + gettext wrapGAppsHook ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 4ba750e9423d9..7f32e45f5d31e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -30,7 +30,7 @@ , libcanberra-gtk2 , libgnome , libgnomeui -, defaultIconTheme +, gnome3 , libGLU_combined , nspr , nss @@ -118,7 +118,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 defaultIconTheme ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index b331e7f188ea9..9906a76ec12db 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { hunspell libevent libstartup_notification /* cairo */ icu libpng jemalloc ] - ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; + ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ]; # from firefox + m4 + wrapperTool nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; |