mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
google-chrome: add darwin support, move updateScript out
google-chrome: fix launch error on linux Co-authored-by: Masum Reza <masumrezarock100@gmail.com> google-chrome: fix updater script to use /usr/bin/env nix-shell Co-authored-by: Jon Seager <jon@sgrs.uk>
This commit is contained in:
DontEatOreo
John Titor
parent
f4e18f55ef
commit
dc77c81ef9
@ -4,7 +4,7 @@
|
||||
makeWrapper,
|
||||
patchelf,
|
||||
stdenv,
|
||||
writeScript,
|
||||
stdenvNoCC,
|
||||
|
||||
# Linked dynamic libraries.
|
||||
alsa-lib,
|
||||
@ -91,9 +91,12 @@
|
||||
|
||||
# For Vulkan support (--enable-features=Vulkan)
|
||||
addDriverRunpath,
|
||||
undmg,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "google-chrome";
|
||||
|
||||
opusWithCustomModes = libopus.override { withCustomModes = true; };
|
||||
|
||||
deps =
|
||||
@ -159,9 +162,8 @@ let
|
||||
gtk4
|
||||
];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "google-chrome";
|
||||
linux = stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "127.0.6533.88";
|
||||
|
||||
src = fetchurl {
|
||||
@ -169,6 +171,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-0l9cidNFO0dcyzWy4nDD/OGFQDBLXx9aPVq6ioDkqK0=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
# ie, $out/share/google/chrome/google-chrome
|
||||
strictDeps = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
patchelf
|
||||
@ -185,8 +191,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
ar x $src
|
||||
tar xf data.tar.xz
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
|
||||
@ -205,16 +213,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cp -a opt/* $out/share
|
||||
cp -a usr/share/* $out/share
|
||||
|
||||
|
||||
substituteInPlace $out/share/google/$appname/google-$appname \
|
||||
--replace 'CHROME_WRAPPER' 'WRAPPER'
|
||||
--replace-fail 'CHROME_WRAPPER' 'WRAPPER'
|
||||
substituteInPlace $out/share/applications/google-$appname.desktop \
|
||||
--replace /usr/bin/google-chrome-$dist $exe
|
||||
--replace-fail /usr/bin/google-chrome-$dist $exe
|
||||
substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
|
||||
--replace /opt/google/$appname/google-$appname $exe
|
||||
--replace-fail /opt/google/$appname/google-$appname $exe
|
||||
substituteInPlace $out/share/menu/google-$appname.menu \
|
||||
--replace /opt $out/share \
|
||||
--replace $out/share/google/$appname/google-$appname $exe
|
||||
--replace-fail /opt $out/share \
|
||||
--replace-fail $out/share/google/$appname/google-$appname $exe
|
||||
|
||||
for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do
|
||||
num_and_suffix="''${icon_file##*logo_}"
|
||||
@ -245,30 +252,57 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
});
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update-google-chrome.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
set -euo pipefail
|
||||
url="https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/stable/versions/all/releases"
|
||||
response="$(curl --silent --fail $url)"
|
||||
version="$(jq ".releases[0].version" --raw-output <<< $response)"
|
||||
update-source-version ${finalAttrs.pname} $version --ignore-same-hash
|
||||
'';
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "127.0.6533.89";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/aclo5k72baz7erlbweyjruguwh2a_127.0.6533.89/GoogleChrome-127.0.6533.89.dmg";
|
||||
hash = "sha256-YUHhHyId3MMZFuKlx/xzuGSYLi62QazCLoyl+00+mbA=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
undmg
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
cp -r *.app $out/Applications
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper $out/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome $out/bin/google-chrome-stable \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
});
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
changelog = "https://chromereleases.googleblog.com/";
|
||||
description = "Freeware web browser developed by Google";
|
||||
homepage = "https://www.google.com/chrome/browser/";
|
||||
changelog = "https://chromereleases.googleblog.com/";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
jnsgruk
|
||||
johnrtitor
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "google-chrome-stable";
|
||||
};
|
||||
})
|
||||
in
|
||||
if stdenvNoCC.isDarwin then darwin else linux
|
||||
|
||||
100
pkgs/by-name/go/google-chrome/update.sh
Executable file
100
pkgs/by-name/go/google-chrome/update.sh
Executable file
@ -0,0 +1,100 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq gawk libossp_uuid libxml2 nix
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DEFAULT_NIX="$(realpath "./pkgs/by-name/go/google-chrome/package.nix")"
|
||||
|
||||
get_version_info() {
|
||||
local platform="$1"
|
||||
local start_pattern="$2"
|
||||
local end_pattern="$3"
|
||||
|
||||
local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases"
|
||||
local response
|
||||
local version
|
||||
local current_version
|
||||
|
||||
response="$(curl --silent --fail "$url")"
|
||||
version="$(jq ".releases[0].version" --raw-output <<< "$response")"
|
||||
current_version="$(awk "/${start_pattern}/,/${end_pattern}/ { if (\$0 ~ /version = \"/) { match(\$0, /version = \"([^\"]+)\"/, arr); print arr[1]; exit } }" "$DEFAULT_NIX")"
|
||||
|
||||
echo "$version" "$current_version"
|
||||
}
|
||||
|
||||
update_linux() {
|
||||
local version_info
|
||||
local version
|
||||
local current_version
|
||||
local new_hash
|
||||
local new_sri_hash
|
||||
|
||||
read -ra version_info <<< "$(get_version_info "linux" "linux = stdenv.mkDerivation" "});")"
|
||||
version="${version_info[0]}"
|
||||
current_version="${version_info[1]}"
|
||||
|
||||
if [[ "$current_version" = "$version" ]]; then
|
||||
echo "[Nix] Linux google chrome: same version"
|
||||
return 0
|
||||
fi
|
||||
|
||||
local download_url="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${version}-1_amd64.deb"
|
||||
new_hash="$(nix-prefetch-url "$download_url" 2>/dev/null)"
|
||||
new_sri_hash="$(nix hash to-sri --type sha256 "$new_hash")"
|
||||
|
||||
sed -i "/^ linux = stdenv.mkDerivation/,/^ });/s/version = \".*\"/version = \"$version\"/" "$DEFAULT_NIX"
|
||||
sed -i "/^ linux = stdenv.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX"
|
||||
|
||||
echo "[Nix] Linux google-chrome: $current_version -> $version with hash $new_hash"
|
||||
}
|
||||
|
||||
update_darwin() {
|
||||
local version_info
|
||||
local version
|
||||
local current_version
|
||||
local uuid
|
||||
local url
|
||||
local pkg
|
||||
local manifest_version
|
||||
local new_hash
|
||||
local new_sri_hash
|
||||
|
||||
read -ra version_info <<< "$(get_version_info "mac" "darwin = stdenvNoCC.mkDerivation" "});")"
|
||||
version="${version_info[0]}"
|
||||
current_version="${version_info[1]}"
|
||||
uuid="$(uuidgen)"
|
||||
|
||||
if [[ "$current_version" = "$version" ]]; then
|
||||
echo "[Nix] Darwin google chrome: same version"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
local post_data="<?xml version='1.0' encoding='UTF-8'?>
|
||||
<request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='1'
|
||||
sessionid='$uuid' installsource='ondemandcheckforupdate'
|
||||
requestid='$uuid' dedup='cr'>
|
||||
<hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
|
||||
<os platform='mac' version='$version' arch='arm64'/>
|
||||
<app appid='com.google.Chrome' ap=' ' version=' ' nextversion=' ' lang=' ' brand='GGLS' client=' '>
|
||||
<updatecheck/>
|
||||
</app>
|
||||
</request>"
|
||||
|
||||
response="$(curl -s -X POST -H "Content-Type: text/xml" --data "$post_data" "https://tools.google.com/service/update2")"
|
||||
url="$(echo "$response" | xmllint --xpath "string(//url[contains(@codebase, 'http://dl.google.com/release2')]/@codebase)" -)"
|
||||
pkg="$(echo "$response" | xmllint --xpath "string(//package/@name)" -)"
|
||||
manifest_version="$(echo "$response" | xmllint --xpath "string(//manifest/@version)" -)"
|
||||
|
||||
local download_url="$url$pkg"
|
||||
new_hash="$(nix hash to-sri --type sha256 "$(nix-prefetch-url "$download_url" 2>/dev/null)")"
|
||||
new_sri_hash="$(nix hash to-sri --type sha256 "$new_hash")"
|
||||
|
||||
sed -i "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s/version = \".*\"/version = \"$manifest_version\"/" "$DEFAULT_NIX"
|
||||
sed -i "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX"
|
||||
sed -i "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s|url = \".*\"|url = \"$download_url\"|" "$DEFAULT_NIX"
|
||||
|
||||
echo "[Nix] Darwin google-chrome: $current_version -> $manifest_version with hash $new_hash"
|
||||
}
|
||||
|
||||
update_linux
|
||||
update_darwin
|
||||
Loading…
Reference in New Issue
Block a user