commit 74df3bb889786d59fc8d11a08857cc18ed34da38 · pyrox.dev/nixpkgs

+6 -2

pkgs/applications/networking/browsers/chromium/common.nix

···

       7
       7
        
       , xdg-utils, yasm, nasm, minizip, libwebp

     

       8
       8
        
       , libusb1, pciutils, nss, re2

     

       9
       9
        
       

     

       10
       10
       -
       , python2Packages, perl, pkg-config

     

       10
       10
       +
       , python2Packages, python3Packages, perl, pkg-config

     

       11
       11
        
       , nspr, systemd, libkrb5

     

       12
       12
        
       , util-linux, alsaLib

     

       13
       13
        
       , bison, gperf

     
···

       130
       130
        
             ninja which python2Packages.python perl pkg-config

     

       131
       131
        
             python2Packages.ply python2Packages.jinja2 nodejs

     

       132
       132
        
             gnutar python2Packages.setuptools

     

       133
       133
       +
           ] ++ optionals (chromiumVersionAtLeast "91") [

     

       134
       134
       +
             python3Packages.python

     

       133
       135
        
           ];

     

       134
       136
        
       

     

       135
       137
        
           buildInputs = defaultDependencies ++ [

     
···

       160
       162
        
             url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch";

     

       161
       163
        
             sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";

     

       162
       164
        
           }) ++ optional (chromiumVersionAtLeast "90")

     

       163
       163
       -
             ./fix-missing-atspi2-dependency.patch

     

       165
       165
       +
             ./patches/fix-missing-atspi2-dependency.patch

     

       166
       166
       +
           ++ optional (chromiumVersionAtLeast "91")

     

       167
       167
       +
             ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch

     

       164
       168
        
           ;

     

       165
       169
        
       

     

       166
       170
        
           postPatch = ''

pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch

+31

pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch

···

       1
       1
       +
       From e031b8be0fb2a22f953c034cdf08ca9befe130d2 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Michael Weiss <dev.primeos@gmail.com>

     

       3
       3
       +
       Date: Sun, 11 Apr 2021 18:05:12 +0200

     

       4
       4
       +
       Subject: [PATCH] closure_compiler: Use the Java binary from the system

     

       5
       5
       +
       

     

       6
       6
       +
       The bundled Java binary (third_party/jdk/current/bin/java) is missing in

     

       7
       7
       +
       the tarball and we want to use the one from the system anyway.

     

       8
       8
       +
       This reverts part of [0].

     

       9
       9
       +
       

     

       10
       10
       +
       [0]: https://chromium-review.googlesource.com/c/chromium/src/+/2778794

     

       11
       11
       +
       ---

     

       12
       12
       +
        third_party/closure_compiler/compiler.py | 3 +--

     

       13
       13
       +
        1 file changed, 1 insertion(+), 2 deletions(-)

     

       14
       14
       +
       

     

       15
       15
       +
       diff --git a/third_party/closure_compiler/compiler.py b/third_party/closure_compiler/compiler.py

     

       16
       16
       +
       index 75690ceb9749..7b9c76f74290 100755

     

       17
       17
       +
       --- a/third_party/closure_compiler/compiler.py

     

       18
       18
       +
       +++ b/third_party/closure_compiler/compiler.py

     

       19
       19
       +
       @@ -13,8 +13,7 @@ import subprocess

     

       20
       20
       +
        

     

       21
       21
       +
        

     

       22
       22
       +
        _CURRENT_DIR = os.path.join(os.path.dirname(__file__))

     

       23
       23
       +
       -_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")

     

       24
       24
       +
       -assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"

     

       25
       25
       +
       +_JAVA_PATH = "java"

     

       26
       26
       +
        

     

       27
       27
       +
        class Compiler(object):

     

       28
       28
       +
          """Runs the Closure compiler on given source files to typecheck them

     

       29
       29
       +
       -- 

     

       30
       30
       +
       2.20.1

     

       31
       31
       +

+3 -3

pkgs/applications/networking/browsers/chromium/upstream-info.json

···

       18
       18
        
           }

     

       19
       19
        
         },

     

       20
       20
        
         "beta": {

     

       21
       21
       -
           "version": "90.0.4430.61",

     

       22
       22
       -
           "sha256": "01vssy3q64pv9rw4cdxv5rdg7yrxmhyc03a5r75fhxc95fj66iac",

     

       23
       23
       -
           "sha256bin64": "07l8dzyv0hav1gls3xw91q9ay2l8xxmsf7yagg940cya9ncl0lhi",

     

       21
       21
       +
           "version": "90.0.4430.70",

     

       22
       22
       +
           "sha256": "0jnyqnqwdccv3i55grd12wr2w5ffxyzmj2l3c1i24xawf2zdzyym",

     

       23
       23
       +
           "sha256bin64": "1lv9gz6llphyvlvn92yw1cyhj4i6jzhy1l7hk01418prmhb4nfws",

     

       24
       24
        
           "deps": {

     

       25
       25
        
             "gn": {

     

       26
       26
        
               "version": "2021-02-09",