From 9ce45e44b133c42753aba1ecabe97cac011f76f8 Mon Sep 17 00:00:00 2001
From: Brandon Dimcheff <bdimchef-git@wieldim.com>
Date: Thu, 4 May 2017 21:59:44 -0400
Subject: [PATCH] firefox: fix gnome printing dialog crash

wrapGappsHook was insufficient to fix a firefox (and firefox-bin) crash
when opening a print dialog without gsettings_desktop_schemas

See #24880 for more discussion.
---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 3 ++-
 pkgs/applications/networking/browsers/firefox/default.nix     | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index b6e8ac10fc9cd..13e2e37c1dbde 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -30,6 +30,7 @@
 , libgnome
 , libgnomeui
 , defaultIconTheme
+, gsettings_desktop_schemas
 , mesa
 , nspr
 , nss
@@ -124,7 +125,7 @@ stdenv.mkDerivation {
       stdenv.cc.cc
     ];
 
-  buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ];
+  buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme gsettings_desktop_schemas ];
 
   # "strip" after "patchelf" may break binaries.
   # See: https://github.com/NixOS/patchelf/issues/10
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 3193490b639f9..400be05e00940 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -6,7 +6,7 @@
 , cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc, libpulseaudio
 , autoconf213, which, cargo, rustc
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
-, enableGTK3 ? false, gtk3, wrapGAppsHook
+, enableGTK3 ? false, gtk3, wrapGAppsHook, gsettings_desktop_schemas
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Nightly" or whatever, enable this option.  However, those
@@ -45,7 +45,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
       icu libpng jemalloc
       libpulseaudio # only headers are needed
     ]
-    ++ lib.optional enableGTK3 gtk3
+    ++ lib.optionals enableGTK3 [gtk3 gsettings_desktop_schemas]
     ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst-plugins-base ];
 
   nativeBuildInputs =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3318f55a4af02..6e38eef7841e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13791,7 +13791,7 @@ with pkgs;
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
     gconf = pkgs.gnome2.GConf;
     inherit (pkgs.gnome2) libgnome libgnomeui;
-    inherit (pkgs.gnome3) defaultIconTheme;
+    inherit (pkgs.gnome3) defaultIconTheme gsettings_desktop_schemas;
   };
 
   firefox-bin = wrapFirefox firefox-bin-unwrapped {