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: 7fd90514b359
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c1427bf45ffd
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 20, 2018

  1. chromium: add jdk.jre to build dependencies for versions >= 72 

    thanks for finding out @volth
see 6fba925

(cherry picked from commit bac76e8)
    @bendlas
    bendlas committed Nov 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c1427bf View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/applications/networking/browsers/chromium/common.nix
4 changes: 3 additions & 1 deletion pkgs/applications/networking/browsers/chromium/common.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
, libXScrnSaver, libXcursor, libXtst, libGLU_combined
, protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core
, jdk

# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
@@ -125,7 +126,8 @@ let
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio
++ optional (versionAtLeast version "71") at-spi2-core;
++ optional (versionAtLeast version "71") at-spi2-core
++ optional (versionAtLeast version "72") jdk.jre;

patches = optional enableWideVine ./patches/widevine.patch ++ [
./patches/nix_plugin_paths_68.patch