about summary refs log tree commit diff
diff options
context:
space:
mode:
authoremilylange <git@emilylange.de>2024-05-01 23:37:27 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-05-03 13:05:07 +0000
commit272bd8f9ecc80702ca8cbc8463f3d733af26a02d (patch)
tree261f859023976b8dfcd73f1c4560862fdf99b2b8
parentc074794caba4d641b67ceeea9db3aa9022cdc4cc (diff)
google-chrome: remove leftover `google-chrome-{beta,dev}` code paths
Those are leftovers from when `google-chrome-{beta,dev}` were removed
due to lack of maintenance in 59719f787e94f39e64e9086d08eaedd8a9e61b22.

(cherry picked from commit dfd28b0c05d52782f821dbdf5e710a0a5c80d355)
-rw-r--r--pkgs/applications/networking/browsers/google-chrome/default.nix24
1 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 17b7e288f0a6..55506187c78a 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -28,9 +28,6 @@
 ## Gentoo
 , bzip2, libcap
 
-# Which distribution channel to use.
-, channel ? "stable"
-
 # Necessary for USB audio devices.
 , pulseSupport ? true, libpulseaudio
 
@@ -70,16 +67,10 @@ let
     ++ lib.optional libvaSupport libva
     ++ [ gtk3 gtk4 ];
 
-  suffix = lib.optionalString (channel != "stable") "-${channel}";
-
-  crashpadHandlerBinary = if lib.versionAtLeast version "94"
-    then "chrome_crashpad_handler"
-    else "crashpad_handler";
-
 in stdenv.mkDerivation {
   inherit version;
 
-  name = "google-chrome${suffix}-${version}";
+  pname = "google-chrome";
 
   src = chromium.chromeSrc;
 
@@ -103,11 +94,8 @@ in stdenv.mkDerivation {
   installPhase = ''
     runHook preInstall
 
-    case ${channel} in
-      beta) appname=chrome-beta      dist=beta     ;;
-      dev)  appname=chrome-unstable  dist=unstable ;;
-      *)    appname=chrome           dist=stable   ;;
-    esac
+    appname=chrome
+    dist=stable
 
     exe=$out/bin/google-chrome-$dist
 
@@ -149,7 +137,7 @@ in stdenv.mkDerivation {
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
-    for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary}}; do
+    for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do
       patchelf --set-rpath $rpath $elf
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
     done
@@ -167,8 +155,6 @@ in stdenv.mkDerivation {
     # will try to merge PRs and respond to issues but I'm not actually using
     # Google Chrome.
     platforms = [ "x86_64-linux" ];
-    mainProgram =
-      if (channel == "dev") then "google-chrome-unstable"
-      else "google-chrome-${channel}";
+    mainProgram = "google-chrome-stable";
   };
 }