diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2023-12-05 08:08:39 +0100 |
|---|---|---|
| committer | Ulrik Strid <ulrik.strid@outlook.com> | 2023-12-05 08:46:13 +0100 |
| commit | a3a1a7e25891916d0eaff5463e2df214d1fdd93b (patch) | |
| tree | a6b7e2fc8121e6dae871d3bee7a2d8a932e84f33 /pkgs/development/node-packages/overrides.nix | |
| parent | 84142619ef019754cbfeb123bfb044a4d53a97e7 (diff) | |
| download | nixlib-a3a1a7e25891916d0eaff5463e2df214d1fdd93b.tar nixlib-a3a1a7e25891916d0eaff5463e2df214d1fdd93b.tar.gz nixlib-a3a1a7e25891916d0eaff5463e2df214d1fdd93b.tar.bz2 nixlib-a3a1a7e25891916d0eaff5463e2df214d1fdd93b.tar.lz nixlib-a3a1a7e25891916d0eaff5463e2df214d1fdd93b.tar.xz nixlib-a3a1a7e25891916d0eaff5463e2df214d1fdd93b.tar.zst nixlib-a3a1a7e25891916d0eaff5463e2df214d1fdd93b.zip | |
wrangler: support darwin and arm64
Diffstat (limited to 'pkgs/development/node-packages/overrides.nix')
| -rw-r--r-- | pkgs/development/node-packages/overrides.nix | 71 |
1 files changed, 55 insertions, 16 deletions
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 9b7f2f743226..68f95a2f3b02 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -422,22 +422,61 @@ final: prev: { buildInputs = [ final.node-gyp-build ]; }; - wrangler = prev.wrangler.override (oldAttrs: { - meta = oldAttrs.meta // { broken = before "16.13"; }; - buildInputs = [ pkgs.llvmPackages.libcxx pkgs.llvmPackages.libunwind ] ++ lib.optional stdenv.isLinux pkgs.autoPatchelfHook; - preFixup = '' - # patch elf is trying to patch binary for sunos - rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64 - ''; - dependencies = oldAttrs.dependencies ++ lib.optional stdenv.isLinux ({ - name = "_at_cloudflare_slash_workerd-linux-64"; - packageName = "@cloudflare/workerd-linux-64"; - # Should be same version as workerd - version = "1.20231030.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20231030.0.tgz"; - sha512 = "2HUeRTvoCC17fxE0qdBeR7J9dO8j4A8ZbdcvY8pZxdk+zERU6+N03RTbk/dQMU488PwiDvcC3zZqS4gwLfVT8g=="; + wrangler = prev.wrangler.override (oldAttrs: + let + linuxWorkerd = { + name = "_at_cloudflare_slash_workerd-linux-64"; + packageName = "@cloudflare/workerd-linux-64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20231030.0.tgz"; + sha512 = "2HUeRTvoCC17fxE0qdBeR7J9dO8j4A8ZbdcvY8pZxdk+zERU6+N03RTbk/dQMU488PwiDvcC3zZqS4gwLfVT8g=="; + }; + }; + linuxWorkerdArm = { + name = "_at_cloudflare_slash_workerd-linux-arm64"; + packageName = "@cloudflare/workerd-linux-arm64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20231030.0.tgz"; + sha512 = "4/GK5zHh+9JbUI6Z5xTCM0ZmpKKHk7vu9thmHjUxtz+o8Ne9DoD7DlDvXQWgMF6XGaTubDWyp3ttn+Qv8jDFuQ=="; + }; + }; + darwinWorkerd = { + name = "_at_cloudflare_slash_workerd-darwin-64"; + packageName = "@cloudflare/workerd-darwin-64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20231030.0.tgz"; + sha512 = "0iy34j997llj3jl3l8dipnsyms89qv9nxkza9l2gxmcj6mqwv5m6c8cvgca78qfccl1f5zsrzj855q1fz631p91yydbri2gxgvd10r7"; + }; }; + darwinWorkerdArm = { + name = "_at_cloudflare_slash_workerd-darwin-arm64"; + packageName = "@cloudflare/workerd-darwin-arm64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20231030.0.tgz"; + sha512 = "WSJJjm11Del4hSneiNB7wTXGtBXI4QMCH9l5qf4iT5PAW8cESGcCmdHtWDWDtGAAGcvmLT04KNvmum92vRKKQQ=="; + }; + }; + + in + { + meta = oldAttrs.meta // { broken = before "16.13"; }; + buildInputs = [ pkgs.llvmPackages.libcxx pkgs.llvmPackages.libunwind ] ++ lib.optional stdenv.isLinux pkgs.autoPatchelfHook; + preFixup = '' + # patch elf is trying to patch binary for sunos + rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64 + ''; + dependencies = oldAttrs.dependencies + ++ lib.optional (stdenv.isLinux && stdenv.isx86_64) linuxWorkerd + ++ lib.optional (stdenv.isLinux && stdenv.isAarch64) linuxWorkerdArm + ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) darwinWorkerd + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) darwinWorkerdArm; }); - }); } |