summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-06-20 23:38:08 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-06-20 23:38:08 +0200
commiteb700f7a9315c4a3e78eb58aae9f49b1e10040dd (patch)
tree9f3b41d40edc14db2844272c1e2e71bb923449e2
parenta699dd2bee1f7ee72d6a53fae9d39175a7c80251 (diff)
downloadnixpkgs-eb700f7a9315c4a3e78eb58aae9f49b1e10040dd.tar
nixpkgs-eb700f7a9315c4a3e78eb58aae9f49b1e10040dd.tar.gz
nixpkgs-eb700f7a9315c4a3e78eb58aae9f49b1e10040dd.tar.bz2
nixpkgs-eb700f7a9315c4a3e78eb58aae9f49b1e10040dd.tar.lz
nixpkgs-eb700f7a9315c4a3e78eb58aae9f49b1e10040dd.tar.xz
nixpkgs-eb700f7a9315c4a3e78eb58aae9f49b1e10040dd.tar.zst
nixpkgs-eb700f7a9315c4a3e78eb58aae9f49b1e10040dd.zip
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
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 0 insertions, 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 {