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

Merge pull request #34267 from catern/chromesimple 

google-chrome: remove "with" usage to simplify the expr
This commit is contained in:
Sarah Brofeldt 2018-01-27 02:10:47 +01:00 committed by GitHub
parent b5dbc83b9c 4aab59165f
commit 70a9162a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,13 +38,12 @@
with stdenv.lib; with stdenv.lib;
with chromium.upstream-info;
let let
opusWithCustomModes = libopus.override { opusWithCustomModes = libopus.override {
withCustomModes = true; withCustomModes = true;
}; };
version = chromium.upstream-info.version;
gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
@ -68,7 +67,7 @@ in stdenv.mkDerivation rec {
name = "google-chrome${suffix}-${version}"; name = "google-chrome${suffix}-${version}";
src = binary; src = chromium.upstream-info.binary;
buildInputs = [ buildInputs = [
patchelf patchelf