commit 0dee033ce7d72ff1fe5c394af7943b978c0d68e2 · pyrox.dev/nixpkgs

+16 -4
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

     
···

       42
       42
        
       

     

       43
       43
        
       let

     

       44
       44
        
         jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

     

       45
       45
       +
         # TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py"

     

       46
       46
       +
         # currently doesn't work due to mixed Python 2/3 dependencies:

     

       47
       47
       +
         pythonPackages = if chromiumVersionAtLeast "93"

     

       48
       48
       +
           then python3Packages

     

       49
       49
       +
           else python2Packages;

     

       50
       50
       +
         forcePython3Patch = (githubPatch

     

       51
       51
       +
           # Reland #8 of "Force Python 3 to be used in build."":

     

       52
       52
       +
           "a2d3c362802d9e6b62f895fcda75a3695b77b1b8"

     

       53
       53
       +
           "1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2"

     

       54
       54
       +
         );

     

       45
       55
        
       

     

       46
       56
        
         # The additional attributes for creating derivations based on the chromium

     

       47
       57
        
         # source tree.

     
···

       127
       137
        
       

     

       128
       138
        
           nativeBuildInputs = [

     

       129
       139
        
             llvmPackages.lldClang.bintools

     

       130
       130
       -
             ninja which python2Packages.python perl pkg-config

     

       131
       131
       -
             python2Packages.ply python2Packages.jinja2 nodejs

     

       132
       132
       -
             gnutar python2Packages.setuptools

     

       140
       140
       +
             ninja which pythonPackages.python perl pkg-config

     

       141
       141
       +
             pythonPackages.ply pythonPackages.jinja2 nodejs

     

       142
       142
       +
             gnutar pythonPackages.setuptools

     

       133
       143
        
           ];

     

       134
       144
        
       

     

       135
       145
        
           buildInputs = defaultDependencies ++ [

     
···

       168
       178
        
           postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''

     

       169
       179
        
             # Required for patchShebangs (unsupported):

     

       170
       180
        
             chmod -x third_party/webgpu-cts/src/tools/deno

     

       181
       181
       +
           '' + optionalString (chromiumVersionAtLeast "92") ''

     

       182
       182
       +
             patch -p1 --reverse < ${forcePython3Patch}

     

       171
       183
        
           '' + ''

     

       172
       184
        
             # remove unused third-party

     

       173
       185
        
             for lib in ${toString gnSystemLibraries}; do