Merge pull request #139369 from adisbladis/firefox-beta_dev-93.0b9

firefox-(devedition|beta)-bin: 90.0b6 -> 93.0b9
This commit is contained in:
adisbladis 2021-09-24 21:51:42 -05:00 committed by GitHub
commit 2491eb3bdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 803 additions and 780 deletions

View file

@ -28,7 +28,7 @@
, libXt , libXt
, libcanberra , libcanberra
, libnotify , libnotify
, gnome , adwaita-icon-theme
, libGLU, libGL , libGLU, libGL
, nspr , nspr
, nss , nss
@ -137,7 +137,7 @@ stdenv.mkDerivation {
inherit gtk3; inherit gtk3;
buildInputs = [ wrapGAppsHook gtk3 gnome.adwaita-icon-theme ]; buildInputs = [ wrapGAppsHook gtk3 adwaita-icon-theme ];
# "strip" after "patchelf" may break binaries. # "strip" after "patchelf" may break binaries.
# See: https://github.com/NixOS/patchelf/issues/10 # See: https://github.com/NixOS/patchelf/issues/10

View file

@ -24493,6 +24493,7 @@ with pkgs;
firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; };
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
inherit (gnome) adwaita-icon-theme;
channel = "release"; channel = "release";
generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix;
}; };
@ -24504,6 +24505,7 @@ with pkgs;
}; };
firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override {
inherit (gnome) adwaita-icon-theme;
channel = "beta"; channel = "beta";
generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
}; };
@ -24515,6 +24517,7 @@ with pkgs;
}; };
firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
inherit (gnome) adwaita-icon-theme;
channel = "devedition"; channel = "devedition";
generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix;
}; };