Merge branch 'master' into artboard-gsr

Author: oliverhgraham

.cargo/config.toml

@@ -9,6 +9,9 @@ rustflags = [
 	"-C",
 	"link-arg=--max-memory=4294967296",
 	"--cfg=web_sys_unstable_apis",
+	# TODO: Remove this and find a better way to stay within the 25MB limit of cloudflare pages
+	"-C",
+	"opt-level=s",
 ]
 
 [env]

.nix/default.nix

@@ -31,7 +31,6 @@ let
 
         deps = {
           crane = lib.call ./deps/crane.nix;
-          cef = lib.call ./deps/cef.nix;
           rustGPU = lib.call ./deps/rust-gpu.nix;
         };
 
@@ -63,12 +62,9 @@ in
       graphite-bundle-dev = (lib.call ./pkgs/graphite-bundle.nix) { graphite = graphite-dev; };
       graphite-flatpak-manifest = (lib.call ./pkgs/graphite-flatpak-manifest.nix) { };
       graphite-flatpak-manifest-dev = (lib.call ./pkgs/graphite-flatpak-manifest.nix) { graphite-bundle = graphite-bundle-dev; };
+      graphite-cef = lib.call ./pkgs/graphite-cef.nix;
 
       # TODO: graphene-cli = lib.call ./pkgs/graphene-cli.nix;
-
-      tools = {
-        third-party-licenses = lib.call ./pkgs/tools/third-party-licenses.nix;
-      };
     }
   );
 

.nix/deps/cef.nix

@@ -1,16 +1,15 @@
 { pkgs, ... }:
 
 let
-  extensions = [
-    "rust-src"
-    "rust-analyzer"
-    "clippy"
-    "cargo"
-    "rustc-dev"
-    "llvm-tools"
-  ];
-  toolchain = pkgs.rust-bin.nightly."2025-06-23".default.override {
-    inherit extensions;
+  toolchain = pkgs.rust-bin.nightly."2026-04-11".default.override {
+    extensions = [
+      "rust-src"
+      "rust-analyzer"
+      "clippy"
+      "cargo"
+      "rustc-dev"
+      "llvm-tools"
+    ];
   };
   cargo = pkgs.writeShellScriptBin "cargo" ''
     #!${pkgs.lib.getExe pkgs.bash}
@@ -32,14 +31,12 @@ let
     }).buildRustPackage
       (finalAttrs: {
         pname = "rustc_codegen_spirv";
-        version = "0-unstable-2025-08-04";
-        src = pkgs.fetchFromGitHub {
-          owner = "Firestar99";
-          repo = "rust-gpu-new";
-          rev = "c12f216121820580731440ee79ebc7403d6ea04f";
-          hash = "sha256-rG1cZvOV0vYb1dETOzzbJ0asYdE039UZImobXZfKIno=";
+        version = "0.10.0-alpha.1";
+        src = pkgs.fetchCrate {
+          inherit (finalAttrs) pname version;
+          sha256 = "sha256-zJEpExkPgYzwo7fR4ge4GxJNj7H5yo4bJ4eTOw36+7c=";
         };
-        cargoHash = "sha256-AEigcEc5wiBd3zLqWN/2HSbkfOVFneAqNvg9HsouZf4=";
+        cargoHash = "sha256-J1rtbfGqrL2NJ7Bu2pYfDwCdUmnECB/kzxrpYluA0kY=";
         cargoBuildFlags = [
           "-p"
           "rustc_codegen_spirv"

.nix/deps/rust-gpu.nix

@@ -1,4 +1,10 @@
-{ pkgs, deps, ... }:
+{
+  pkgs,
+  deps,
+  self,
+  system,
+  ...
+}:
 
 let
   libs = [
@@ -22,7 +28,6 @@ pkgs.mkShell (
 
       pkgs.lld
       pkgs.nodejs
-      pkgs.nodePackages.npm
       pkgs.binaryen
       pkgs.wasm-bindgen-cli_0_2_100
       pkgs.wasm-pack
@@ -52,13 +57,10 @@ pkgs.mkShell (
       pkgs.graphviz
     ];
 
-    LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath libs}:${deps.cef.env.CEF_PATH}";
+    CEF_PATH = self.packages.${system}.graphite-cef;
+    LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath libs}:${self.packages.${system}.graphite-cef}";
     XDG_DATA_DIRS = "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS";
 
-    shellHook = ''
-      alias cargo='mold --run cargo'
-    '';
   }
-  // deps.cef.env
   // deps.rustGPU.env
 )

.nix/dev.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  deps,
   self,
   system,
   ...
@@ -33,7 +34,7 @@ let
           cp -r ${graphite}/share out/share
           mkdir -p out/lib/cef
           mkdir -p ./cef
-          tar -xvf ${pkgs.cef-binary.src} -C ./cef --strip-components=1
+          tar -xvf ${self.packages.${system}.graphite-cef.src} -C ./cef --strip-components=1
           cp -r ./cef/Release/* out/lib/cef/
           cp -r ./cef/Resources/* out/lib/cef/
           find "out/lib/cef/locales" -type f ! -name 'en-US*' -delete

.nix/pkgs/graphite-bundle.nix

@@ -0,0 +1,46 @@
+{ pkgs, ... }:
+
+let
+  version = "147.0.10+gd58e84d+chromium-147.0.7727.118";
+  hashes = {
+    aarch64-linux = "sha256-kaRijMDacPcoeCcS31zmRSNOvgozx+uq2M34mD28bu4=";
+		x86_64-linux = "sha256-CHzPofBDhCniDZEpOxXK4I7p57SYjMAY1HVo3Vna0e8=";
+  };
+
+  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;
+  };
+in
+pkgs.cef-binary.overrideAttrs (finalAttrs: {
+  version = builtins.head (builtins.split "\\+" version);
+  inherit src;
+  postInstall = ''
+    rm -r $out/* $out/.* || true
+    strip ./Release/*.so*
+    mv ./Release/* $out/
+    find "./Resources/locales" -maxdepth 1 -type f ! -name 'en-US.pak' -delete
+    mv ./Resources/* $out/
+    mv ./include $out/
+
+    cat ./CREDITS.html | ${pkgs.xz}/bin/xz -9 -e -c > $out/CREDITS.html.xz
+
+    echo '${
+      builtins.toJSON {
+        type = "minimal";
+        name = builtins.baseNameOf finalAttrs.src.url;
+        sha1 = "";
+      }
+    }' > $out/archive.json
+  '';
+})

.nix/pkgs/graphite-cef.nix

@@ -50,7 +50,7 @@ let
         pkgs.pkg-config
         pkgs.lld
       ];
-      env = deps.cef.env;
+      env.CEF_PATH = self.packages.${system}.graphite-cef;
       buildPhase =
         let
           profile = if dev then "dev" else "release";
@@ -82,7 +82,6 @@ deps.crane.lib.buildPackage (
       pkgs.pkg-config
       pkgs.lld
       pkgs.nodejs
-      pkgs.nodePackages.npm
       pkgs.binaryen
       pkgs.wasm-bindgen-cli_0_2_100
       pkgs.wasm-pack
@@ -98,10 +97,11 @@ deps.crane.lib.buildPackage (
     npmConfigScript = "setup";
     makeCacheWritable = true;
 
-    env = deps.cef.env // {
+    env = {
       RASTER_NODES_SHADER_PATH = self.packages.${system}.graphite-raster-nodes-shaders;
       GRAPHITE_GIT_COMMIT_HASH = self.rev or "unknown";
       GRAPHITE_GIT_COMMIT_DATE = self.lastModified or "unknown";
+      CEF_PATH = self.packages.${system}.graphite-cef;
     };
 
     postPatch = ''
@@ -150,8 +150,9 @@ deps.crane.lib.buildPackage (
       remove-references-to -t "${common.cargoVendorDir}" $out/bin/graphite
 
       patchelf \
-        --set-rpath "${pkgs.lib.makeLibraryPath libs}:${deps.cef.env.CEF_PATH}" \
+        --set-rpath "${pkgs.lib.makeLibraryPath libs}:${self.packages.${system}.graphite-cef}" \
         --add-needed libGL.so \
+        --add-needed libEGL.so \
         $out/bin/graphite
     '';
 

.nix/pkgs/graphite.nix

@@ -70,5 +70,6 @@
 		"*.graphite": "json"
 	},
 	"editor.renderWhitespace": "boundary",
-	"editor.minimap.markSectionHeaderRegex": "// ===+\\n\\s*//\\s*(?<label>[^\\n]{1,18})[^\\n]*(\\n\\s*//[^\\n]*)*\\n\\s*// ===+"
+	"editor.minimap.markSectionHeaderRegex": "// ===+\\n\\s*//\\s*(?<label>[^\\n]{1,18})[^\\n]*(\\n\\s*//[^\\n]*)*\\n\\s*// ===+",
+	"git.addAICoAuthor": "off"
 }