JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

google-chrome: add -beta and -unstable variants

Browse Source 
It is a little weird that chromium has chromium, chromiumBeta,
chromiumDev but this one is google-chrome, google-chrome-beta,
google-chrome-dev.  Not quite sure what the best resolution is, if any.
This commit is contained in:
Benjamin Staffin 2015-12-28 00:31:48 -08:00
parent 7195e6e14f
commit c8368cf124
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -35,8 +35,6 @@ with (import ../chromium/source/update.nix {
}).getChannel channel; }).getChannel channel;
let let
dist = if channel == "dev" then "unstable" else channel;
opusWithCustomModes = libopus.override { opusWithCustomModes = libopus.override {
withCustomModes = true; withCustomModes = true;
}; };
@ -71,7 +69,13 @@ in stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
exe=$out/bin/google-chrome-${dist} case ${channel} in
beta) appname=chrome-beta dist=beta ;;
dev) appname=chrome-unstable dist=unstable ;;
*) appname=chrome dist=stable ;;
esac
exe=$out/bin/google-chrome-$dist
rpath="${env}/lib:${env}/lib64" rpath="${env}/lib:${env}/lib64"
mkdir -p $out/bin $out/share mkdir -p $out/bin $out/share
@ -79,32 +83,32 @@ in stdenv.mkDerivation rec {
cp -a opt/* $out/share cp -a opt/* $out/share
cp -a usr/share/* $out/share cp -a usr/share/* $out/share
substituteInPlace $out/share/applications/google-chrome.desktop \ substituteInPlace $out/share/applications/google-$appname.desktop \
--replace /usr/bin/google-chrome-${dist} $exe --replace /usr/bin/google-chrome-$dist $exe
substituteInPlace $out/share/gnome-control-center/default-apps/google-chrome.xml \ substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
--replace /opt/google/chrome/google-chrome $exe --replace /opt/google/$appname/google-$appname $exe
substituteInPlace $out/share/menu/google-chrome.menu \ substituteInPlace $out/share/menu/google-$appname.menu \
--replace /opt $out/share \ --replace /opt $out/share \
--replace $out/share/google/chrome/google-chrome $exe --replace $out/share/google/chrome/google-$appname $exe
for icon_file in $out/share/google/chrome/product_logo_*[0-9].png; do for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do
num_and_suffix="''${icon_file##*logo_}" num_and_suffix="''${icon_file##*logo_}"
icon_size="''${num_and_suffix%.*}" icon_size="''${num_and_suffix%.*}"
logo_output_prefix="$out/share/icons/hicolor" logo_output_prefix="$out/share/icons/hicolor"
logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
mkdir -p "$logo_output_path" mkdir -p "$logo_output_path"
mv "$icon_file" "$logo_output_path/google-chrome.png" mv "$icon_file" "$logo_output_path/google-$appname.png"
done done
cat > $exe << EOF cat > $exe << EOF
#!${bash}/bin/sh #!${bash}/bin/sh
export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
export PATH=${env}/bin\''${PATH:+:\$PATH} export PATH=${env}/bin\''${PATH:+:\$PATH}
$out/share/google/chrome/google-chrome "\$@" $out/share/google/$appname/google-$appname "\$@"
EOF EOF
chmod +x $exe chmod +x $exe
for elf in $out/share/google/chrome/{chrome,chrome-sandbox,nacl_helper}; do for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do
patchelf --set-rpath $rpath $elf patchelf --set-rpath $rpath $elf
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
done done
@ -112,7 +116,7 @@ in stdenv.mkDerivation rec {
meta = { meta = {
description = "A freeware web browser developed by Google"; description = "A freeware web browser developed by Google";
homepage = "https://www.google.com/chrome/browser/"; homepage = https://www.google.com/chrome/browser/;
license = licenses.unfree; license = licenses.unfree;
maintainers = [ maintainers.msteen ]; maintainers = [ maintainers.msteen ];
platforms = platforms.linux; platforms = platforms.linux;

4
pkgs/top-level/all-packages.nix
View File

@ -12025,6 +12025,10 @@ let
google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; }; google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; };
google-chrome-beta = google-chrome.override { channel = "beta"; };
google-chrome-dev = google-chrome.override { channel = "dev"; };
googleearth = callPackage_i686 ../applications/misc/googleearth { }; googleearth = callPackage_i686 ../applications/misc/googleearth { };
google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {