about summary refs log tree commit diff
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2021-09-24 20:32:46 -0500
committeradisbladis <adisbladis@gmail.com>2021-09-24 20:34:11 -0500
commit28d8ad0be1a42ac439f4bfe84df1c1eac4c83506 (patch)
treef628a778e61910728f262a539cc40f5343b1cf8c
parent8eeb28ffc3cb5265d080626faa76c6e600c32d33 (diff)
downloadnixlib-28d8ad0be1a42ac439f4bfe84df1c1eac4c83506.tar
nixlib-28d8ad0be1a42ac439f4bfe84df1c1eac4c83506.tar.gz
nixlib-28d8ad0be1a42ac439f4bfe84df1c1eac4c83506.tar.bz2
nixlib-28d8ad0be1a42ac439f4bfe84df1c1eac4c83506.tar.lz
nixlib-28d8ad0be1a42ac439f4bfe84df1c1eac4c83506.tar.xz
nixlib-28d8ad0be1a42ac439f4bfe84df1c1eac4c83506.tar.zst
nixlib-28d8ad0be1a42ac439f4bfe84df1c1eac4c83506.zip
firefox-bin: Don't reference gnome in expression
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.
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 551453e9a2eb..54763b801817 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c083038afa72..d58a24e5f029 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;
   };