Skip to content

Commit

Permalink
firefox: fix gnome printing dialog crash
Browse files Browse the repository at this point in the history
wrapGappsHook was insufficient to fix a firefox (and firefox-bin) crash
when opening a print dialog without gsettings_desktop_schemas

See NixOS#24880 for more discussion.
  • Loading branch information
bdimcheff committed May 5, 2017
1 parent 7369fd0 commit 9ce45e4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
, libgnome
, libgnomeui
, defaultIconTheme
, gsettings_desktop_schemas
, mesa
, nspr
, nss
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 9ce45e4

Please sign in to comment.