diff --git a/home/isabel/vicinae/default.nix b/home/isabel/vicinae/default.nix index 94215bb3..018226bc 100644 --- a/home/isabel/vicinae/default.nix +++ b/home/isabel/vicinae/default.nix @@ -16,15 +16,22 @@ in extensions = map mkMyVicinaeExt [ { extName = "nix"; - npmDepsHash = "sha256-HPWNUznCWVPz39PlPEBR7GpgbC0DuIAvVBdB2GAs47A="; + npmDepsHash = "sha256-TEyCCDjAtRYX2uH2TpLfe4/hTzyfMiyDhzVdyQXhEus="; } { extName = "wifi-commander"; - npmDepsHash = "sha256-lP/M+r8Y6j15i8vOxZG75vHUnmVss2gX/5oWvPUft1Q="; + npmDepsHash = "sha256-jwqICwIlJPRV3UdFBtA5ltjR8dImPFtsOqda1MqPMY4="; } { extName = "bluetooth"; - npmDepsHash = "sha256-WN8tMQIZKr1MjttcFX8ft623gElN0BY9uvEjUpPNjZQ="; + npmDepsHash = "sha256-F/vURwdEPwzZwlS4j0lGV8aN7VDGmdiV+WCy2vXN2Eo="; + + # usocket 0.3.0 requires `debug` without declaring it as a + # dependency, so esbuild cannot resolve it; stub out the logger + preBuild = '' + substituteInPlace node_modules/usocket/index.js \ + --replace-fail "var debug = require('debug')(\"usocket\");" "var debug = function () { };" + ''; } { extName = "pdsls"; diff --git a/home/isabel/vicinae/extension.nix b/home/isabel/vicinae/extension.nix index 39b6f62c..a0b40d9d 100644 --- a/home/isabel/vicinae/extension.nix +++ b/home/isabel/vicinae/extension.nix @@ -27,15 +27,15 @@ lib.extendMkDerivation { fetchFromGitHub { owner = "vicinaehq"; repo = "extensions"; - rev = "c7a8d7d2e3fa599922c4964a94315c55c9bfe80b"; - hash = "sha256-M2hmGokQXbvoKUEvkgF2IIxOUGCF5v7bXyjPzpSQIJw="; + rev = "afb84fe4b5253777ff82db8e19e6cc0c9b7f811f"; + hash = "sha256-Non+frT3WG0TN60zCq63m8+d7yNmCCMaI363kZaDmPM="; } else fetchFromGitHub { owner = "raycast"; repo = "extensions"; - rev = "b51d43359d1b3bde44046956bb53aecb7549c0da"; - hash = "sha256-pSUiNWo8D/ZMEcivMR/uSUGHBpVTW3ITdKBlWf/GmtU="; + rev = "6b00026a230c116ca890b6e8c0b0a343cd6cbae7"; + hash = "sha256-iqITYshrGABjaOWl6AKXuOznvPlfjQkZ3cvFFzthl9M="; # littrally grind to a halt if we don't add this sparseCheckout = [ "/extensions/${extName}" ]; @@ -45,7 +45,11 @@ lib.extendMkDerivation { dontNpmInstall = true; buildPhase = '' - npm run build -- -o=$out + runHook preBuild + + npm run build -- -o "$out" + + runHook postBuild ''; }; }