seres/nexus
Watch
1
0
Fork
You've already forked nexus
 0
forked from Nexus/nexus
Code Pull requests Activity

Reapply "override webcrypto to a version with build hooks"

Browse source 
This reverts commit eca2b0b558.
This commit is contained in:
Henry Hiles 2026-10-19 20:02:34 -04:00
commit 2c8a4da2a8
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
9 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -135,12 +135,6 @@ dart scripts/generate.dart
> export CPATH="$(clang -v 2>&1 | grep "Selected GCC installation" | rev | cut -d' ' -f1 | rev)/include"
> ```
Build webcrypto:
```sh
flutter pub run webcrypto:setup
```
Build generated files, and watch for new changes:
```sh

4
linux/flutter/generated_plugin_registrant.cc
View file

@ -14,7 +14,6 @@
#include <pasteboard/pasteboard_plugin.h>
#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
#include <url_launcher_linux/url_launcher_plugin.h>
#include <webcrypto/webcrypto_plugin.h>
#include <window_manager/window_manager_plugin.h>
void fl_register_plugins(FlPluginRegistry* registry) {
@ -42,9 +41,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
g_autoptr(FlPluginRegistrar) webcrypto_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "WebcryptoPlugin");
webcrypto_plugin_register_with_registrar(webcrypto_registrar);
g_autoptr(FlPluginRegistrar) window_manager_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin");
window_manager_plugin_register_with_registrar(window_manager_registrar);

1
linux/flutter/generated_plugins.cmake
View file

@ -11,7 +11,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
pasteboard
screen_retriever_linux
url_launcher_linux
webcrypto
window_manager
)

2
linux/nix/pkg/default.nix
View file

@ -40,9 +40,11 @@ flutter.buildFlutterApplication {
linkify = "sha256-TpMD6+0zyY6i9l+6d8ErnVufmepCv362rCtnbOht/z4=";
fab_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI=";
m3e_design = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI=";
native_toolchain_cmake = "sha256-/drnHZebmTnsCnHgC1xmlAe+U4PSrjw5Sm9axicuTrY=";
navigation_rail_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI=";
unifiedpush_linux = "sha256-aIF/8oabSuuZo7K6qr4r7UBmf57qgoGAXyJ40fdntuQ=";
unifiedpush_platform_interface = "sha256-aIF/8oabSuuZo7K6qr4r7UBmf57qgoGAXyJ40fdntuQ=";
webcrypto = "sha256-jC5hTIcfnhqm/rD9myrfXfA5+Wkf5CfTYjtAnlT4FN4=";
xdg_desktop_portal = "sha256-8GgiXHGv+wy6hJgj/rZxbymMitNVmdDLAnedZm9STSc=";
};

2
macos/Flutter/GeneratedPluginRegistrant.swift
View file

@ -17,7 +17,6 @@ import screen_retriever_macos
import shared_preferences_foundation
import url_launcher_macos
import wakelock_plus
import webcrypto
import window_manager
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
@ -33,6 +32,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
WebcryptoPlugin.register(with: registry.registrar(forPlugin: "WebcryptoPlugin"))
WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
}

30
pubspec.lock
View file

@ -177,6 +177,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.1.2"
change_case:
dependency: transitive
description:
name: change_case
sha256: e41ef3df58521194ef8d7649928954805aeb08061917cf658322305e61568003
url: "https://pub.dev"
source: hosted
version: "2.2.0"
characters:
dependency: transitive
description:
@ -1024,6 +1032,15 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.19.5"
native_toolchain_cmake:
dependency: "direct overridden"
description:
path: "."
ref: "quad/fix/native-aarch64"
resolved-ref: ecc5b48feab382d2bd2dfe70321c692213ee5218
url: "https://github.com/Henry-Hiles/native_toolchain_cmake"
source: git
version: "0.3.2"
navigation_rail_m3e:
dependency: "direct main"
description:
@ -1729,13 +1746,14 @@ packages:
source: hosted
version: "3.0.3"
webcrypto:
dependency: "direct dev"
dependency: "direct overridden"
description:
name: webcrypto
sha256: "6b43001c4110856ff7fa5e5e65e7b2d44bec1d8b54a4d84d5fa2c7622267c5c1"
url: "https://pub.dev"
source: hosted
version: "0.6.0"
path: "."
ref: da6648cf87309af4271e312c447e0356f8fda5d1
resolved-ref: da6648cf87309af4271e312c447e0356f8fda5d1
url: "https://github.com/google/webcrypto.dart"
source: git
version: "0.6.2-wip"
webpush_encryption:
dependency: transitive
description:

11
pubspec.yaml
View file

@ -22,6 +22,15 @@ environment:
dependency_overrides:
path_provider_android: 2.2.23 # Pinned to avoid JNI
dynamic_color: 2.1.0
code_assets: 2.1.0 # webcrypto requires ^1.0.0, but works with 2.x
webcrypto:
git:
url: https://github.com/google/webcrypto.dart
ref: da6648cf87309af4271e312c447e0356f8fda5d1 # Uses build hooks, unreleased
native_toolchain_cmake:
git:
url: https://github.com/Henry-Hiles/native_toolchain_cmake
ref: quad/fix/native-aarch64 # Fixes native aarch64 linux builds
m3e_design:
git:
url: https://github.com/Henry-Hiles/material_3_expressive
@ -115,8 +124,6 @@ dev_dependencies:
riverpod_lint: 3.1.9
flutter_launcher_icons: 0.14.4
json_serializable: 6.14.1
# Transitive dep but needed for commands
webcrypto: 0.6.0
flutter_launcher_icons:
image_path: assets/icon.png

3
windows/flutter/generated_plugin_registrant.cc
View file

@ -14,7 +14,6 @@
#include <pasteboard/pasteboard_plugin.h>
#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
#include <url_launcher_windows/url_launcher_windows.h>
#include <webcrypto/webcrypto_plugin.h>
#include <window_manager/window_manager_plugin.h>
void RegisterPlugins(flutter::PluginRegistry* registry) {
@ -34,8 +33,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
UrlLauncherWindowsRegisterWithRegistrar(
registry->GetRegistrarForPlugin("UrlLauncherWindows"));
WebcryptoPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("WebcryptoPlugin"));
WindowManagerPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("WindowManagerPlugin"));
}

1
windows/flutter/generated_plugins.cmake
View file

@ -11,7 +11,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
pasteboard
screen_retriever_windows
url_launcher_windows
webcrypto
window_manager
)