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

Commits on Apr 2, 2020

  1. chromiumDev: Remove a patch that is already applied 

    This fixes the patch phase.
I missed this problem in #83956.
    @primeos
    primeos committed Apr 2, 2020
    Copy the full SHA
    36c7123 View commit details
Showing with 3 additions and 63 deletions.
  1. +3 −2 pkgs/applications/networking/browsers/chromium/common.nix
  2. +0 −61 pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch
5 changes: 3 additions & 2 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Original file line number Diff line number Diff line change
@@ -140,8 +140,6 @@ let
./patches/no-build-timestamps.patch
./patches/widevine-79.patch
./patches/dont-use-ANGLE-by-default.patch
# fix race condition in the interaction with pulseaudio
./patches/webrtc-pulse.patch
# Unfortunately, chromium regularly breaks on major updates and
# then needs various patches backported in order to be compiled with GCC.
# Good sources for such patches and other hints:
@@ -151,6 +149,9 @@ let
#
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (versionRange "80" "82.0.4076.0") [
# fix race condition in the interaction with pulseaudio
(githubPatch "704dc99bd05a94eb61202e6127df94ddfd571e85" "0nzwzfwliwl0959j35l0gn94sbsnkghs3dh1b9ka278gi7q4648z")
] ++ optionals (useVaapi) [
# source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
./patches/vaapi-fix.patch
61 changes: 0 additions & 61 deletions pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch
View file

This file was deleted.