diff --git a/.nix/pkgs/graphite-cef.nix b/.nix/pkgs/graphite-cef.nix index 732ffd0943..4e131a2c77 100644 --- a/.nix/pkgs/graphite-cef.nix +++ b/.nix/pkgs/graphite-cef.nix @@ -1,30 +1,27 @@ { pkgs, ... }: let - version = "149.0.5+g6770623+chromium-149.0.7827.197"; - hashes = { - aarch64-linux = "sha256-cBAvcvs1rAg5EKJkCt81RZYupCWpUNIC/nLt3PJow7Q="; - x86_64-linux = "sha256-OPGMBJmvvLiLdBDniBQwx7LmTGGI59AcesJdILSeqcs="; - }; + version = "149.7827.0"; + upstream = "149.0.5+g6770623+chromium-149.0.7827.197"; selectSystem = attrs: attrs.${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system ${pkgs.stdenv.hostPlatform.system}"); - src = pkgs.fetchurl { - url = "https://cef-builds.spotifycdn.com/cef_binary_${version}_${ - selectSystem { - aarch64-linux = "linuxarm64"; - x86_64-linux = "linux64"; - } - }_minimal.tar.bz2"; - hash = selectSystem hashes; + src = selectSystem { + x86_64-linux = pkgs.fetchurl { + url = "https://github.com/timon-schelling/graphite-cef/releases/download/v${version}/graphite_cef_x86-64_linux.tar.xz"; + hash = "sha256-CtvS/+NUh5ilnunt4AsWaZfWPiCsdEtz6+TLADT1Gqk="; + }; + aarch64-linux = pkgs.fetchurl { + url = "https://cef-builds.spotifycdn.com/cef_binary_${upstream}_linuxarm64_minimal.tar.bz2"; + hash = "sha256-cBAvcvs1rAg5EKJkCt81RZYupCWpUNIC/nLt3PJow7Q="; + }; }; in -pkgs.cef-binary.overrideAttrs (finalAttrs: { - version = builtins.head (builtins.split "\\+" version); - inherit src; +pkgs.cef-binary.overrideAttrs (_: { + inherit src version; postInstall = '' rm -r $out/* $out/.* || true strip ./Release/*.so* @@ -38,7 +35,7 @@ pkgs.cef-binary.overrideAttrs (finalAttrs: { echo '${ builtins.toJSON { type = "minimal"; - name = builtins.baseNameOf finalAttrs.src.url; + name = "cef_binary_${upstream}"; sha1 = ""; } }' > $out/archive.json diff --git a/node-graph/libraries/wgpu-executor/src/context.rs b/node-graph/libraries/wgpu-executor/src/context.rs index cb83597fef..e959af5d48 100644 --- a/node-graph/libraries/wgpu-executor/src/context.rs +++ b/node-graph/libraries/wgpu-executor/src/context.rs @@ -49,7 +49,7 @@ impl ContextBuilder { let mut adapters = enumerate_sorted(&instance, self.backends).await; if let Some(index) = self.selection - && index >= adapters.len() + && index < adapters.len() { let selected_adapter = adapters.remove(index); adapters.insert(0, selected_adapter);