cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

firefox-bin: Don't reference gnome in expression

Browse source 
Infix matching is used a heuristic in nixpkgs-update for what _not_ to
update which causes the firefox-bin packages not to get picked up by
the automatic updater.

While this "fix" isn't ideal and complicates the call-sites a bit I
think the trade-off is worth it to have up-to-date Firefox packages.
This commit is contained in:
adisbladis 2021-09-24 20:32:46 -05:00
parent 8eeb28ffc3
commit 28d8ad0be1
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox-bin/default.nix
View file

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

3
pkgs/top-level/all-packages.nix
View file

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