commit 2572634a6d50fdd1aafbd4f98c3553a08ec3f011 · pyrox.dev/nixpkgs

+1

pkgs/development/compilers/flutter/engine/default.nix

···

       51
        
             runtimeMode

     

       52
        
             outName

     

       53
        
             dart

     

       0
        
       
     

       54
        
             ;

     

       55
        
           inherit altRuntimeMode;

     

       56

···

       51
        
             runtimeMode

     

       52
        
             outName

     

       53
        
             dart

     

       54
       +
             swiftshader

     

       55
        
             ;

     

       56
        
           inherit altRuntimeMode;

     

       57

+13 -4

pkgs/development/compilers/flutter/engine/package.nix

···

       15
        
         fetchgit,

     

       16
        
         runCommand,

     

       17
        
         llvmPackages,

     

       0
        
       
     

       18
        
         patchelf,

     

       19
        
         openbox,

     

       20
        
         xorg,

     
···

       67
        
           url = "https://swiftshader.googlesource.com/SwiftShader.git";

     

       68
        
           hash = swiftshaderHash;

     

       69
        
           rev = swiftshaderRev;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       70
        
         };

     

       71
        
       

     

       72
        
         llvm = symlinkJoin {

     
···

       178
        
         postUnpack = ''

     

       179
        
           pushd ${src.name}

     

       180
        
       

     

       181
       -
           ln -s $swiftshader src/flutter/third_party/swiftshader

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       182
        
       

     

       183
        
           ${lib.optionalString (stdenv.isLinux) ''

     

       184
        
             for patchtool in ''${patchtools[@]}; do

     
···

       197
        
             git commit -a -m "$rev" --quiet

     

       198
        
             popd

     

       199
        
           done

     

       200
       -
       

     

       201
       -
           mkdir -p src/flutter/buildtools/${constants.alt-platform}

     

       202
       -
           ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang

     

       203
        
       

     

       204
        
           dart src/third_party/dart/tools/generate_package_config.dart

     

       205
        
           cp ${./pkg-config.py} src/build/config/linux/pkg-config.py

···

       15
        
         fetchgit,

     

       16
        
         runCommand,

     

       17
        
         llvmPackages,

     

       18
       +
         llvmPackages_15,

     

       19
        
         patchelf,

     

       20
        
         openbox,

     

       21
        
         xorg,

     
···

       68
        
           url = "https://swiftshader.googlesource.com/SwiftShader.git";

     

       69
        
           hash = swiftshaderHash;

     

       70
        
           rev = swiftshaderRev;

     

       71
       +
       

     

       72
       +
           postFetch = ''

     

       73
       +
             rm -rf $out/third_party/llvm-project

     

       74
       +
           '';

     

       75
        
         };

     

       76
        
       

     

       77
        
         llvm = symlinkJoin {

     
···

       183
        
         postUnpack = ''

     

       184
        
           pushd ${src.name}

     

       185
        
       

     

       186
       +
           cp -pr --reflink=auto $swiftshader src/flutter/third_party/swiftshader

     

       187
       +
           chmod -R u+w -- src/flutter/third_party/swiftshader

     

       188
       +
       

     

       189
       +
           ln -s ${llvmPackages_15.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project

     

       190
       +
       

     

       191
       +
           mkdir -p src/flutter/buildtools/${constants.alt-platform}

     

       192
       +
           ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang

     

       193
       +
           ln -s ${dart} src/third_party/dart/tools/sdks/dart-sdk

     

       194
        
       

     

       195
        
           ${lib.optionalString (stdenv.isLinux) ''

     

       196
        
             for patchtool in ''${patchtools[@]}; do

     
···

       209
        
             git commit -a -m "$rev" --quiet

     

       210
        
             popd

     

       211
        
           done

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       212
        
       

     

       213
        
           dart src/third_party/dart/tools/generate_package_config.dart

     

       214
        
           cp ${./pkg-config.py} src/build/config/linux/pkg-config.py

+5

pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in

···

       2
        
       fetchgit {

     

       3
        
         url = "https://swiftshader.googlesource.com/SwiftShader.git";

     

       4
        
         rev = "@engine_swiftshader_rev@";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5
        
       }

···

       2
        
       fetchgit {

     

       3
        
         url = "https://swiftshader.googlesource.com/SwiftShader.git";

     

       4
        
         rev = "@engine_swiftshader_rev@";

     

       5
       +
       

     

       6
       +
         # Keep with in sync of pkgs/development/compilers/flutter/engine/package.nix

     

       7
       +
         postFetch = ''

     

       8
       +
           rm -rf $out/third_party/llvm-project

     

       9
       +
         '';

     

       10
        
       }

+1 -1

pkgs/development/compilers/flutter/versions/3_13/data.json

···

       1
        
       {

     

       2
        
         "version": "3.13.8",

     

       3
        
         "engineVersion": "767d8c75e898091b925519803830fc2721658d07",

     

       4
       -
         "engineSwiftShaderHash": "sha256-N6f5aeDroqEwZlUBZi7nhDW8leE/7DqmOtRYOY4wzf4=",

     

       5
        
         "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8",

     

       6
        
         "channel": "stable",

     

       7
        
         "engineHashes": {

···

       1
        
       {

     

       2
        
         "version": "3.13.8",

     

       3
        
         "engineVersion": "767d8c75e898091b925519803830fc2721658d07",

     

       4
       +
         "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=",

     

       5
        
         "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8",

     

       6
        
         "channel": "stable",

     

       7
        
         "engineHashes": {

+1 -1

pkgs/development/compilers/flutter/versions/3_16/data.json

···

       1
        
       {

     

       2
        
         "version": "3.16.7",

     

       3
        
         "engineVersion": "4a585b79294e830fa89c24924d58a27cc8fbf406",

     

       4
       -
         "engineSwiftShaderHash": "sha256-N6f5aeDroqEwZlUBZi7nhDW8leE/7DqmOtRYOY4wzf4=",

     

       5
        
         "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8",

     

       6
        
         "channel": "stable",

     

       7
        
         "engineHashes": {

···

       1
        
       {

     

       2
        
         "version": "3.16.7",

     

       3
        
         "engineVersion": "4a585b79294e830fa89c24924d58a27cc8fbf406",

     

       4
       +
         "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=",

     

       5
        
         "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8",

     

       6
        
         "channel": "stable",

     

       7
        
         "engineHashes": {

+1 -1

pkgs/development/compilers/flutter/versions/3_19/data.json

···

       1
        
       {

     

       2
        
         "version": "3.19.4",

     

       3
        
         "engineVersion": "a5c24f538d05aaf66f7972fb23959d8cafb9f95a",

     

       4
       -
         "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=",

     

       5
        
         "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",

     

       6
        
         "channel": "stable",

     

       7
        
         "engineHashes": {

···

       1
        
       {

     

       2
        
         "version": "3.19.4",

     

       3
        
         "engineVersion": "a5c24f538d05aaf66f7972fb23959d8cafb9f95a",

     

       4
       +
         "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",

     

       5
        
         "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",

     

       6
        
         "channel": "stable",

     

       7
        
         "engineHashes": {

+1 -1

pkgs/development/compilers/flutter/versions/3_22/data.json

···

       1
        
       {

     

       2
        
         "version": "3.22.2",

     

       3
        
         "engineVersion": "edd8546116457bdf1c5bdfb13ecb9463d2bb5ed4",

     

       4
       -
         "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=",

     

       5
        
         "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",

     

       6
        
         "channel": "stable",

     

       7
        
         "engineHashes": {

···

       1
        
       {

     

       2
        
         "version": "3.22.2",

     

       3
        
         "engineVersion": "edd8546116457bdf1c5bdfb13ecb9463d2bb5ed4",

     

       4
       +
         "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",

     

       5
        
         "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",

     

       6
        
         "channel": "stable",

     

       7
        
         "engineHashes": {

+1 -1

pkgs/development/compilers/flutter/versions/3_23/data.json

···

       1
        
       {

     

       2
        
         "version": "3.23.0-0.1.pre",

     

       3
        
         "engineVersion": "bb10c5466638e963479ba5e64e601e42d1a43447",

     

       4
       -
         "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=",

     

       5
        
         "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",

     

       6
        
         "channel": "beta",

     

       7
        
         "engineHashes": {

···

       1
        
       {

     

       2
        
         "version": "3.23.0-0.1.pre",

     

       3
        
         "engineVersion": "bb10c5466638e963479ba5e64e601e42d1a43447",

     

       4
       +
         "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",

     

       5
        
         "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",

     

       6
        
         "channel": "beta",

     

       7
        
         "engineHashes": {