Merge branch 'master' into vector_mesh_fixes

Author: 4adex

.nix/flake.lock

@@ -24,6 +24,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
+
+    # This is used to provide a identical development shell at `shell.nix` for users that do not use flakes
+    flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
   };
 
   outputs = { nixpkgs, nixpkgs-unstable, rust-overlay, flake-utils, ... }:
@@ -36,34 +39,50 @@
         pkgs-unstable = import nixpkgs-unstable {
           inherit system overlays;
         };
-        
+
         rustc-wasm = pkgs.rust-bin.stable.latest.default.override {
           targets = [ "wasm32-unknown-unknown" ];
           extensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
         };
 
+        libcef = pkgs.libcef.overrideAttrs (finalAttrs: previousAttrs: {
+          version = "138.0.26";
+          gitRevision = "84f2d27";
+          chromiumVersion = "138.0.7204.158";
+          srcHash = "sha256-d9jQJX7rgdoHfROD3zmOdMSesRdKE3slB5ZV+U2wlbQ=";
+
+          __intentionallyOverridingVersion = true;
+
+          postInstall = ''
+            strip $out/lib/*
+          '';
+        });
+
+        libcefPath = pkgs.runCommand "libcef-path" {} ''
+          mkdir -p $out
+
+          ln -s ${libcef}/include $out/include
+          find ${libcef}/lib -type f -name "*" -exec ln -s {} $out/ \;
+          find ${libcef}/libexec -type f -name "*" -exec ln -s {} $out/ \;
+          cp -r ${libcef}/share/cef/* $out/
+
+          echo '${builtins.toJSON {
+            type = "minimal";
+            name = builtins.baseNameOf libcef.src.url;
+            sha1 = "";
+          }}' > $out/archive.json
+        '';
+
         # Shared build inputs - system libraries that need to be in LD_LIBRARY_PATH
         buildInputs = with pkgs; [
           # System libraries
+          wayland
+          wayland.dev
           openssl
           vulkan-loader
           mesa
           libraw
-
-
-          # Tauri dependencies: keep in sync with https://v2.tauri.app/start/prerequisites/#system-dependencies (under the NixOS tab)
-          at-spi2-atk
-          atkmm
-          cairo
-          gdk-pixbuf
-          glib
-          gtk3
-          harfbuzz
-          librsvg
-          libsoup_3
-          pango
-          webkitgtk_4_1
-          openssl
+          libGL
         ];
 
         # Development tools that don't need to be in LD_LIBRARY_PATH
@@ -88,23 +107,21 @@
           cargo-watch
           cargo-nextest
           cargo-expand
-          
+
           # Profiling tools
           gnuplot
           samply
           cargo-flamegraph
-
         ];
       in
       {
         # Development shell configuration
         devShells.default = pkgs.mkShell {
           packages = buildInputs ++ buildTools ++ devTools;
 
-          LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
-          GIO_MODULE_DIR="${pkgs.glib-networking}/lib/gio/modules/";
+          LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath buildInputs}:${libcefPath}";
+          CEF_PATH = libcefPath;
           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'

.nix/flake.nix

@@ -0,0 +1,31 @@
+# This is a helper file for people using NixOS as their operating system.
+# If you don't know what this file does, you can safely ignore it.
+
+# If you are using Nix as your package manager, you can run 'nix-shell .nix'
+# in the root directory of the project and Nix will open a bash shell
+# with all the packages needed to build and run Graphite installed.
+# A shell.nix file is used in the Nix ecosystem to define a development
+# environment with specific dependencies. When you enter a Nix shell using
+# this file, it ensures that all the specified tools and libraries are
+# available regardless of the host system's configuration. This provides
+# a reproducible development environment across different machines and developers.
+
+# You can enter the Nix shell and run Graphite like normal with:
+# > npm start
+# Or you can run it like this without needing to first enter the Nix shell:
+# > nix-shell .nix --command "npm start"
+
+# Uses flake compat to provide a development shell that is identical to the one defined in the flake
+(import
+  (
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+      nodeName = lock.nodes.root.inputs.flake-compat;
+    in
+    fetchTarball {
+      url = lock.nodes.${nodeName}.locked.url;
+      sha256 = lock.nodes.${nodeName}.locked.narHash;
+    }
+  )
+  { src = ./.; }
+).shellNix