Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e45362b7b76
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e984f9e48e19
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 11, 2018

  1. chromium: build with gcc7 

    Fixes NixOS/nixpkgs#37314
    @pbogdan
    pbogdan committed Apr 11, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lukekarrys Luke Karrys
    GPG key ID: 586238713720A638
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    152a6d0 View commit details

  2. Merge pull request #38799 from pbogdan/chromium-gcc7 

    [17.09] chromium: build with gcc7
    @7c6f434c
    7c6f434c authored Apr 11, 2018
    Copy the full SHA
    e984f9e View commit details
Showing with 3 additions and 0 deletions.
  1. +2 −0 pkgs/applications/networking/browsers/chromium/default.nix
  2. +1 −0 pkgs/top-level/all-packages.nix
2 changes: 2 additions & 0 deletions pkgs/applications/networking/browsers/chromium/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ let
callPackage = newScope chromium;

chromium = {
inherit stdenv;

upstream-info = (callPackage ./update.nix {}).getChannel channel;

mkChromiumDerivation = callPackage ./common.nix {
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -13886,6 +13886,7 @@ with pkgs;
enablePepperFlash = config.chromium.enablePepperFlash or false;
enableWideVine = config.chromium.enableWideVine or false;
gnome = gnome2;
stdenv = overrideCC stdenv gcc7;
};

chronos = callPackage ../applications/networking/cluster/chronos { };