commit dbb774c5e1a9fde65aa6f1010e0e8a8df2b786c9 · pyrox.dev/nixpkgs

+13 -2

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

···

       44
        
         # source tree.

     

       45
        
         extraAttrs = buildFun base;

     

       46
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       47
        
         mkGnFlags =

     

       48
        
           let

     

       49
        
             # Serialize Nix types into GN types according to this document:

     
···

       139
        
             # for updated patches and hints about build flags

     

       140
        
             ++ optionals (versionRange "63" "64") [

     

       141
        
             ./patches/chromium-gcc5-r4.patch

     

       0
        
       
     

       142
        
             ./patches/include-math-for-round.patch

     

       143
       -
           ]

     

       144
       -
             ++ optional enableWideVine ./patches/widevine.patch;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       145
        
       

     

       146
        
           postPatch = ''

     

       147
        
             # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX

···

       44
        
         # source tree.

     

       45
        
         extraAttrs = buildFun base;

     

       46
        
       

     

       47
       +
         gentooPatch = name: sha256: fetchurl {

     

       48
       +
           url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}";

     

       49
       +
           inherit sha256;

     

       50
       +
         };

     

       51
       +
       

     

       52
        
         mkGnFlags =

     

       53
        
           let

     

       54
        
             # Serialize Nix types into GN types according to this document:

     
···

       144
        
             # for updated patches and hints about build flags

     

       145
        
             ++ optionals (versionRange "63" "64") [

     

       146
        
             ./patches/chromium-gcc5-r4.patch

     

       147
       +
             (gentooPatch "chromium-gcc5-r5.patch" "0z7rggizzg85wfr8zhw0yfwd3q69lsh3yp297s939jgzp66cwwkw")

     

       148
        
             ./patches/include-math-for-round.patch

     

       149
       +
           ] ++ optionals (versionRange "64" "65") [

     

       150
       +
             ## This is a first guess on what patches are needed for 64

     

       151
       +
             # (gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5")

     

       152
       +
             (gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl")

     

       153
       +
             # (gentooPatch "chromium-clang-r2.patch" "1lsqr7cbjsad5pyyp6kyrfmcgcqy2z2yzgp4zxwjq95fknrfi5a4")

     

       154
       +
             (gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc")

     

       155
       +
           ]  ++ optional enableWideVine ./patches/widevine.patch;

     

       156
        
       

     

       157
        
           postPatch = ''

     

       158
        
             # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX

+9 -9

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

···

       1
        
       # This file is autogenerated from update.sh in the same directory.

     

       2
        
       {

     

       3
        
         beta = {

     

       4
       -
           sha256 = "1mv01q6sdvkmfyk9q834zcaq1z4s07sgfp5i107vgcbwnmwmhpgi";

     

       5
       -
           sha256bin64 = "0x176ijcmn25xhn4apn3yal1xb14rz0xaiy2mjbknm011s4ysvby";

     

       6
       -
           version = "64.0.3282.24";

     

       7
        
         };

     

       8
        
         dev = {

     

       9
       -
           sha256 = "1mv01q6sdvkmfyk9q834zcaq1z4s07sgfp5i107vgcbwnmwmhpgi";

     

       10
       -
           sha256bin64 = "15zmh4ix6822kzqcapkpjzsjkd4yaw45jgddh5gdv65j65a6fhlq";

     

       11
       -
           version = "64.0.3282.24";

     

       12
        
         };

     

       13
        
         stable = {

     

       14
       -
           sha256 = "0aqsqd2s4hj3lci7wa7bss4wy4sv889f0z4va7fqp9sd36c0gn27";

     

       15
       -
           sha256bin64 = "188wxkagihq77aaikkdiq923bbx7a0np73skhrfd4y38lygirry9";

     

       16
       -
           version = "63.0.3239.108";

     

       17
        
         };

     

       18
        
       }

···

       1
        
       # This file is autogenerated from update.sh in the same directory.

     

       2
        
       {

     

       3
        
         beta = {

     

       4
       +
           sha256 = "1mkschqjdn3n3709qkxha1zs626vhh33dp80gi3h6hhk8w0gx4sb";

     

       5
       +
           sha256bin64 = "05hyfm9j127mprj2wjrq3m9qm4zp3bny40164vscr6vkfxvmjh03";

     

       6
       +
           version = "64.0.3282.71";

     

       7
        
         };

     

       8
        
         dev = {

     

       9
       +
           sha256 = "1b7f1bs9i7dhrccssn5zk4s62sfpmkj8b4w6aq8g4jbyg7hw9pql";

     

       10
       +
           sha256bin64 = "0lp8m62p8h60hi8h5nskcjdh6k8vq4g00xbq5limg7d6pgc0vyyz";

     

       11
       +
           version = "65.0.3311.3";

     

       12
        
         };

     

       13
        
         stable = {

     

       14
       +
           sha256 = "139x3cbc5pa14x69493ic8i2ank12c9fwiq6pqm11aps88n6ri44";

     

       15
       +
           sha256bin64 = "03r97jg1fcb23k1xg5qnw5hp5p9m8anyx346nchbas63rfn439km";

     

       16
       +
           version = "63.0.3239.132";

     

       17
        
         };

     

       18
        
       }