From 4aab59165f2a17f636bbee60f51681d30270b86e Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Thu, 25 Jan 2018 20:59:39 +0000 Subject: [PATCH] google-chrome: remove "with" usage to simplify the expr This "with" usage makes it trickier to track where the actual source package of this derivation comes from. Remove that use of with to make it a little easier to understand. --- .../networking/browsers/google-chrome/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index b868c434e23..b1b1132f22b 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -38,13 +38,12 @@ with stdenv.lib; -with chromium.upstream-info; - let opusWithCustomModes = libopus.override { withCustomModes = true; }; + version = chromium.upstream-info.version; gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; 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}"; - src = binary; + src = chromium.upstream-info.binary; buildInputs = [ patchelf