Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b5dbc83b9c97
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 70a9162a772a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 25, 2018

  1. 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.
    catern committed Jan 25, 2018
    Copy the full SHA
    4aab591 View commit details

Commits on Jan 27, 2018

  1. Merge pull request #34267 from catern/chromesimple

    google-chrome: remove "with" usage to simplify the expr
    srhb authored Jan 27, 2018
    Copy the full SHA
    70a9162 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/applications/networking/browsers/google-chrome/default.nix
Original file line number Diff line number Diff line change
@@ -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