diff options
| author | ajs124 <git@ajs124.de> | 2021-07-12 15:56:03 +0200 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2021-07-12 16:47:34 +0200 |
| commit | c6e51d03695efa90a8d09b41fe6441953e21d52a (patch) | |
| tree | e55aa3bcef737f2014e6c5d1ee34da72a1536730 /pkgs/applications/networking/browsers/firefox/wrapper.nix | |
| parent | b332794adf841262958424c623c442cc8fab92e8 (diff) | |
| download | nixpkgs-c6e51d03695efa90a8d09b41fe6441953e21d52a.tar nixpkgs-c6e51d03695efa90a8d09b41fe6441953e21d52a.tar.gz nixpkgs-c6e51d03695efa90a8d09b41fe6441953e21d52a.tar.bz2 nixpkgs-c6e51d03695efa90a8d09b41fe6441953e21d52a.tar.lz nixpkgs-c6e51d03695efa90a8d09b41fe6441953e21d52a.tar.xz nixpkgs-c6e51d03695efa90a8d09b41fe6441953e21d52a.tar.zst nixpkgs-c6e51d03695efa90a8d09b41fe6441953e21d52a.zip | |
firefox-wrapper: also make gtk3-support non-optional here
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/wrapper.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f2fa787c17c..202821b0978 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify +, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify , gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native @@ -44,8 +44,6 @@ let , nixExtensions ? null }: - assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used - let ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; @@ -73,7 +71,7 @@ let ++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional alsaSupport alsa-lib ++ pkcs11Modules; - gtk_modules = [ libcanberra-gtk2 ]; + gtk_modules = [ libcanberra-gtk3 ]; ######################### # # @@ -183,7 +181,7 @@ let }; nativeBuildInputs = [ makeWrapper lndir ]; - buildInputs = lib.optional (browser ? gtk3) browser.gtk3; + buildInputs = [ browser.gtk3 ]; buildCommand = lib.optionalString stdenv.isDarwin '' @@ -266,13 +264,11 @@ let --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ ${lib.optionalString forceWayland '' --set MOZ_ENABLE_WAYLAND "1" \ - ''}${lib.optionalString (browser ? gtk3) - ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' - '' - } + ''} ############################# # # # END EXTRA PREF CHANGES # |