diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-06-18 14:45:43 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-06-18 14:48:41 +0200 |
| commit | ddeb2f5cceef9d5cc146972850e6990cec1e7981 (patch) | |
| tree | fdb3a1a03bc7a81dd082a2cc4f9da5377496f63b /pkgs | |
| parent | af4c5f9cc4b6251f49ea7ab0133b405dd8178050 (diff) | |
| download | nixlib-ddeb2f5cceef9d5cc146972850e6990cec1e7981.tar nixlib-ddeb2f5cceef9d5cc146972850e6990cec1e7981.tar.gz nixlib-ddeb2f5cceef9d5cc146972850e6990cec1e7981.tar.bz2 nixlib-ddeb2f5cceef9d5cc146972850e6990cec1e7981.tar.lz nixlib-ddeb2f5cceef9d5cc146972850e6990cec1e7981.tar.xz nixlib-ddeb2f5cceef9d5cc146972850e6990cec1e7981.tar.zst nixlib-ddeb2f5cceef9d5cc146972850e6990cec1e7981.zip | |
firefox: fix file-dialogs and icons with gtk3
There was the usual crashing and a few icons missing. @lethalman: I think it's best to start putting $XDG_ICON_DIRS into suffix instead of prefix (as here), so user-installed icons take precedence. /cc #7743.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 727f89fe6687..f10df2dc9960 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -95,6 +95,11 @@ stdenv.mkDerivation rec { # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* + '' + lib.optionalString enableGTK3 + '' + wrapProgram "$out/bin/firefox" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \ + --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; meta = { |