diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index e1a4ad1f1978..bd683016779f 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - flutter338, + flutter341, keybinder3, nodejs, pnpm_9, @@ -16,6 +16,7 @@ libxtst, libx11, libxkbcommon, + xorgproto, libayatana-appindicator, gtk3, desktop-file-utils, @@ -25,13 +26,13 @@ }: let - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Wox-launcher"; repo = "Wox"; tag = "v${version}"; - hash = "sha256-1g38ry6+iWiRBLVbgLNaotc/jlsG5LLVYvzJbmEjIdA="; + hash = "sha256-Qav2RhmhJQr2D1D3okshIrnnQuOh7V1gWbZwXR3LBAc="; }; metaCommon = { @@ -41,7 +42,7 @@ let maintainers = [ ]; }; - ui-flutter = flutter338.buildFlutterApplication { + ui-flutter = flutter341.buildFlutterApplication { pname = "wox-ui-flutter"; inherit version src; @@ -49,9 +50,19 @@ let pubspecLock = lib.importJSON ./pubspec.lock.json; + postPatch = '' + substituteInPlace linux/runner/my_application.cc \ + --replace-fail "X11/Xkeysym.h" "X11/keysym.h" + ''; + nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ keybinder3 ]; + buildInputs = [ + keybinder3 + xorgproto + libx11 + libxtst + ]; meta = metaCommon // { mainProgram = "wox"; @@ -79,8 +90,8 @@ let sourceRoot ; pnpm = pnpm_9; - fetcherVersion = 2; - hash = "sha256-8EovIVJ+uAo9XJIIgRrpkQrcmNkKC2Ruja2md7NFZ4A="; + fetcherVersion = 3; + hash = "sha256-cbuVQV8ih8rztERFLUHGnK63MBz8+QVmzeegYLDwcj4="; }; buildPhase = '' @@ -160,7 +171,7 @@ buildGoModule { sed -i '/^ "path"$/d' plugin/host/host_python.go ''; - vendorHash = "sha256-JA6D0i6lgWYGz8jS4m5yO4JCawbEaVpGGFoQ1QnNqpg="; + vendorHash = "sha256-IDcIEZVCJp1ls5c2fblgX+I+MhfRDXqFbf0GhgcFiTo="; proxyVendor = true; diff --git a/pkgs/by-name/wo/wox/pubspec.lock.json b/pkgs/by-name/wo/wox/pubspec.lock.json index 8ceb11cbce9c..1cd7eeaa314d 100644 --- a/pkgs/by-name/wo/wox/pubspec.lock.json +++ b/pkgs/by-name/wo/wox/pubspec.lock.json @@ -306,6 +306,12 @@ "source": "hosted", "version": "0.3.5" }, + "flutter_driver": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, "flutter_highlight": { "dependency": "direct main", "description": { @@ -388,6 +394,12 @@ "source": "hosted", "version": "2.0.0" }, + "fuchsia_remote_debug_protocol": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, "get": { "dependency": "direct main", "description": { @@ -498,6 +510,12 @@ "source": "hosted", "version": "4.1.2" }, + "integration_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, "intl": { "dependency": "transitive", "description": { @@ -642,11 +660,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.17.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", @@ -798,6 +816,16 @@ "source": "hosted", "version": "6.0.3" }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.5" + }, "protocol_handler": { "dependency": "direct main", "description": { @@ -924,6 +952,16 @@ "source": "hosted", "version": "1.4.1" }, + "sync_http": { + "dependency": "transitive", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, "syncfusion_flutter_core": { "dependency": "transitive", "description": { @@ -1028,11 +1066,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.7" + "version": "0.7.6" }, "tuple": { "dependency": "transitive", @@ -1244,6 +1282,16 @@ "source": "hosted", "version": "3.0.3" }, + "webdriver": { + "dependency": "transitive", + "description": { + "name": "webdriver", + "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, "win32": { "dependency": "transitive", "description": {