Post refactor fixup (#3395)

* fixup

* fix feature deps for native

Author: timon-schelling

.nix/flake.nix

@@ -83,6 +83,7 @@
             pkgs.cargo
             pkgs.rust-analyzer
             pkgs.clippy
+            pkgs.rustfmt
 
             pkgs.git
 
@@ -107,7 +108,7 @@
             args:
             (import ./pkgs/graphite.nix {
               pkgs = pkgs // {
-                inherit graphene-raster-nodes-shaders;
+                inherit raster-nodes-shaders;
               };
               inherit
                 info
@@ -126,7 +127,7 @@
             dev = true;
           };
           #TODO: graphene-cli = import ./pkgs/graphene-cli.nix { inherit info pkgs inputs deps libs tools; };
-          graphene-raster-nodes-shaders = import ./pkgs/graphene-raster-nodes-shaders.nix {
+          raster-nodes-shaders = import ./pkgs/raster-nodes-shaders.nix {
             inherit
               info
               pkgs

.nix/pkgs/graphite.nix

@@ -78,7 +78,7 @@ deps.crane.lib.buildPackage (
     env =
       common.env
       // {
-        GRAPHENE_RASTER_NODES_SHADER_PATH = pkgs.graphene-raster-nodes-shaders;
+        RASTER_NODES_SHADER_PATH = pkgs.raster-nodes-shaders;
       }
       // (
         if embeddedResources then

…x/pkgs/graphene-raster-nodes-shaders.nix .nix/pkgs/raster-nodes-shaders.nix.nix/pkgs/graphene-raster-nodes-shaders.nix renamed to .nix/pkgs/raster-nodes-shaders.nix .nix/pkgs/graphene-raster-nodes-shaders.nix renamed to .nix/pkgs/raster-nodes-shaders.nix

@@ -9,7 +9,7 @@
 }:
 
 (deps.crane.lib.overrideToolchain (_: deps.rustGPU.toolchain)).buildPackage {
-  pname = "graphene-raster-nodes-shaders";
+  pname = "raster-nodes-shaders";
   inherit (info) version src;
 
   cargoVendorDir = deps.crane.lib.vendorMultipleCargoDeps {
@@ -25,11 +25,11 @@
   env = deps.rustGPU.env;
 
   buildPhase = ''
-    cargo build -r -p graphene-raster-nodes-shaders
+    cargo build -r -p raster-nodes-shaders
   '';
 
   installPhase = ''
-    cp target/spirv-builder/spirv-unknown-naga-wgsl/release/deps/graphene_raster_nodes_shaders_entrypoint.wgsl $out
+    cp target/spirv-builder/spirv-unknown-naga-wgsl/release/deps/raster_nodes_shaders_entrypoint.wgsl $out
   '';
 
   doCheck = false;

frontend/wasm/Cargo.toml

@@ -13,8 +13,8 @@ license = "Apache-2.0"
 [features]
 default = ["gpu", "shader-nodes"]
 gpu = ["editor/gpu"]
-native = []
 shader-nodes = ["graphene-std/shader-nodes", "gpu"]
+native = []
 
 [lib]
 crate-type = ["cdylib", "rlib"]

libraries/path-bool/flake.nix

@@ -7,7 +7,7 @@ authors = ["Graphite Authors <contact@graphite.rs>"]
 license = "MIT OR Apache-2.0"
 
 [features]
-default = ["wasm", "wgpu", "shader-nodes"]
+default = ["wasm", "wgpu"]
 gpu = []
 wgpu = ["gpu", "graph-craft/wgpu", "graphene-application-io/wgpu"]
 wasm = [

libraries/path-bool/shell.nix

@@ -6,8 +6,8 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
 	env_logger::builder().filter_level(log::LevelFilter::Debug).init();
 
 	// Skip building the shader if they are provided externally
-	println!("cargo:rerun-if-env-changed=GRAPHENE_RASTER_NODES_SHADER_PATH");
-	if !std::env::var("GRAPHENE_RASTER_NODES_SHADER_PATH").unwrap_or_default().is_empty() {
+	println!("cargo:rerun-if-env-changed=RASTER_NODES_SHADER_PATH");
+	if !std::env::var("RASTER_NODES_SHADER_PATH").unwrap_or_default().is_empty() {
 		return Ok(());
 	}
 
@@ -49,6 +49,6 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
 	// needs to be fixed upstream
 	let path_to_wgsl = path_to_spv.with_extension("wgsl");
 
-	println!("cargo::rustc-env=GRAPHENE_RASTER_NODES_SHADER_PATH={}", path_to_wgsl.display());
+	println!("cargo::rustc-env=RASTER_NODES_SHADER_PATH={}", path_to_wgsl.display());
 	Ok(())
 }

node-graph/nodes/gstd/Cargo.toml

@@ -1 +1 @@
-pub const WGSL_SHADER: &str = include_str!(env!("GRAPHENE_RASTER_NODES_SHADER_PATH"));
+pub const WGSL_SHADER: &str = include_str!(env!("RASTER_NODES_SHADER_PATH"));