From f0d4f5f842e0b8feddc4e096bc2aea7d6f7a8298 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 22:30:42 +0200 Subject: [PATCH 1/9] thunderbird-bin: drop GStreamer dependency It has not been used since 2015: https://github.com/mozilla/gecko-dev/commit/42c92612f470f15617b13b29cc77c6ec9094350f --- .../networking/mailreaders/thunderbird-bin/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index e9217c84fc6..7c0e75685ec 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -13,8 +13,6 @@ , gdk-pixbuf , glib , glibc -, gst-plugins-base -, gstreamer , gtk2 , gtk3 , kerberos @@ -96,8 +94,6 @@ stdenv.mkDerivation { gdk-pixbuf glib glibc - gst-plugins-base - gstreamer gtk2 gtk3 kerberos From a22a20cb40a2fd5c5c3ec9a06def48ba611294ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 22:35:04 +0200 Subject: [PATCH 2/9] thunderbird-bin: remove GConf dependency It is only optionally dlopened by crash reporter to try to get system proxy settings but no system stores proxy in GConf these days so it is completely useless. https://github.com/mozilla/gecko-dev/blob/97c590ed5532a7b382b5b8500c109de8f1d831e3/toolkit/crashreporter/client/crashreporter_gtk_common.cpp#L121-L122 --- .../networking/mailreaders/thunderbird-bin/default.nix | 2 -- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 7c0e75685ec..77112805860 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, config, makeWrapper -, gconf , alsaLib , at-spi2-atk , atk @@ -80,7 +79,6 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc - gconf alsaLib at-spi2-atk atk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd0797a7efe..26bf33e8623 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22445,7 +22445,6 @@ in thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { - gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; }; From 1cbcbbecc205c2393114bb599057d48aa9df2885 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 22:41:19 +0200 Subject: [PATCH 3/9] thunderbird-bin: do not depend on libcanberra-gtk libxul only needs libcanberra.so.0 https://github.com/mozilla/gecko-dev/blob/3dc26ddcf361bd2fd82f6ccd97999adede522a23/widget/gtk/nsSound.cpp#L158 --- .../networking/mailreaders/thunderbird-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 77112805860..f5ba2f72dc4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -27,7 +27,7 @@ , libXrender , libXt , libxcb -, libcanberra-gtk2 +, libcanberra , libgnome , libgnomeui , gnome3 @@ -107,7 +107,7 @@ stdenv.mkDerivation { libXrender libXt libxcb - libcanberra-gtk2 + libcanberra libgnome libgnomeui libGLU libGL From 3dd5efc40b85cface4089ef80abdb0424ef7bd52 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 22:46:14 +0200 Subject: [PATCH 4/9] thunderbird-bin: remove libgnome dependency It is deprecated and has been removed ages ago: https://bugzilla.mozilla.org/show_bug.cgi?id=694570 It persists in the crash reporter for some reason but it is optional there: https://github.com/mozilla/gecko-dev/blob/f66f5a235e7d74c29b951316f73001126a056734/toolkit/crashreporter/client/crashreporter_linux.cpp#L366-L370 --- .../networking/mailreaders/thunderbird-bin/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f5ba2f72dc4..ba13d666ad9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -28,8 +28,6 @@ , libXt , libxcb , libcanberra -, libgnome -, libgnomeui , gnome3 , libGLU, libGL , nspr @@ -108,8 +106,6 @@ stdenv.mkDerivation { libXt libxcb libcanberra - libgnome - libgnomeui libGLU libGL nspr nss diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26bf33e8623..94a39c2ece3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22444,9 +22444,7 @@ in thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { - inherit (pkgs.gnome2) libgnome libgnomeui; - }; + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; ticpp = callPackage ../development/libraries/ticpp { }; From 5b3a626ab98449d0ca7866af12cb2958862bca7c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:22:55 +0200 Subject: [PATCH 5/9] thunderbird: remove libIDL dependency It has not been used for ages: https://bugzilla.mozilla.org/show_bug.cgi?id=687766 --- .../applications/networking/mailreaders/thunderbird/default.nix | 2 -- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 73536ae5fc1..e9ae6696def 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -18,7 +18,6 @@ , lib , libGL , libGLU -, libIDL , libevent , libjpeg , libnotify @@ -113,7 +112,6 @@ stdenv.mkDerivation rec { jemalloc libGL libGLU - libIDL libevent libjpeg libnotify diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94a39c2ece3..27052d6217d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22436,7 +22436,6 @@ in thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (gnome2) libIDL; inherit (rustPackages_1_42) rustc; libpng = libpng_apng; gtk3Support = true; From 987a5c1e1473a25f84e54949d81592c4cadd9396 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:33:39 +0200 Subject: [PATCH 6/9] firefox: remove libIDL dependency It has not been used for ages: https://bugzilla.mozilla.org/show_bug.cgi?id=687766 --- pkgs/applications/networking/browsers/firefox/common.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 8060895a2e0..0eda0739eab 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -2,7 +2,7 @@ , src, unpackPhase ? null, patches ? [] , extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }: -{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU, libGL, sqlite, unzip, makeWrapper @@ -104,7 +104,7 @@ stdenv.mkDerivation ({ patchFlags = [ "-p1" "-l" ]; buildInputs = [ - gtk2 perl zip libIDL libjpeg zlib bzip2 + gtk2 perl zip libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file libnotify xorg.pixman yasm libGLU libGL diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27052d6217d..c4ac9ac1935 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19740,7 +19740,6 @@ in firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { callPackage = pkgs.newScope { - inherit (gnome2) libIDL; libpng = libpng_apng; python = python2; gnused = gnused_422; From 5384ace0c8c4ca5292bc38abb156d958b06bae53 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:34:54 +0200 Subject: [PATCH 7/9] firefox-bin: do not depend on libcanberra-gtk libxul only needs libcanberra.so.0 https://github.com/mozilla/gecko-dev/blob/3dc26ddcf361bd2fd82f6ccd97999adede522a23/widget/gtk/nsSound.cpp#L158 --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 27eba126de9..127bb5120c0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -27,7 +27,7 @@ , libXinerama , libXrender , libXt -, libcanberra-gtk2 +, libcanberra , libgnome , libgnomeui , libnotify @@ -122,7 +122,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra-gtk2 + libcanberra libgnome libgnomeui libnotify From a699dd2bee1f7ee72d6a53fae9d39175a7c80251 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:37:15 +0200 Subject: [PATCH 8/9] firefox-bin: remove libgnome dependency It is deprecated and has been removed ages ago: https://bugzilla.mozilla.org/show_bug.cgi?id=694570 It persists in the crash reporter for some reason but it is optional there: https://github.com/mozilla/gecko-dev/blob/f66f5a235e7d74c29b951316f73001126a056734/toolkit/crashreporter/client/crashreporter_linux.cpp#L366-L370 --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 127bb5120c0..6cf778c56a9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -28,8 +28,6 @@ , libXrender , libXt , libcanberra -, libgnome -, libgnomeui , libnotify , gnome3 , libGLU, libGL @@ -123,8 +121,6 @@ stdenv.mkDerivation { libXrender libXt libcanberra - libgnome - libgnomeui libnotify libGLU libGL nspr diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4ac9ac1935..41e9c531d03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19761,7 +19761,6 @@ in channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { @@ -19774,7 +19773,6 @@ in channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { @@ -19787,7 +19785,6 @@ in channel = "devedition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { From eb700f7a9315c4a3e78eb58aae9f49b1e10040dd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:38:08 +0200 Subject: [PATCH 9/9] firefox-bin: remove GConf dependency It is only optionally dlopened by crash reporter to try to get system proxy settings but no system stores proxy in GConf these days so it is completely useless. https://github.com/mozilla/gecko-dev/blob/97c590ed5532a7b382b5b8500c109de8f1d831e3/toolkit/crashreporter/client/crashreporter_gtk_common.cpp#L121-L122 --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 -- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6cf778c56a9..cb442f67359 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -8,7 +8,6 @@ , dbus , fontconfig , freetype -, gconf , gdk-pixbuf , glib , glibc @@ -101,7 +100,6 @@ stdenv.mkDerivation { dbus fontconfig freetype - gconf gdk-pixbuf glib glibc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41e9c531d03..d745fe9b979 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19760,7 +19760,6 @@ in firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; - gconf = pkgs.gnome2.GConf; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { @@ -19772,7 +19771,6 @@ in firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; - gconf = pkgs.gnome2.GConf; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { @@ -19784,7 +19782,6 @@ in firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "devedition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; - gconf = pkgs.gnome2.GConf; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {