tmp

Author: timon-schelling

.github/workflows/build-nix-package.yml

@@ -16,3 +16,15 @@ jobs:
 
       - name: Build Nix Package
         run: nix build .nix
+
+  build-without-resources:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+
+      - name: Build Nix Package Without Resources
+        run: nix build .nix#graphite-without-resources

.nix/flake.nix

@@ -101,10 +101,14 @@
     {
       packages = rec {
         default = graphite;
-        graphite = import ./pkgs/graphite.nix {
+        graphite = (import ./pkgs/graphite.nix {
           pkgs = pkgs // { inherit graphene-raster-nodes-shaders; };
           inherit info inputs deps libs tools;
-        };
+        }) {};
+        graphite-without-resources = (import ./pkgs/graphite.nix {
+          pkgs = pkgs // { inherit graphene-raster-nodes-shaders; };
+          inherit info inputs deps libs tools;
+        }) { embeddedResources = false; };
         #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 { inherit info pkgs inputs deps libs tools; };
       };

.nix/pkgs/graphite.nix

@@ -1,19 +1,20 @@
 { info, pkgs, inputs, deps, libs, tools, ... }:
 
+{
+  embeddedResources ? true,
+}:
+
 let
-  cargoDeps = deps.crane.lib.buildDepsOnly {
-    inherit (info) pname version src;
-    strictDeps = true;
-    buildInputs = libs.desktop-all;
-    nativeBuildInputs = tools.desktop;
-  };
-  resources = deps.crane.lib.buildPackage {
+  resourcesCommon =  {
     pname = "${info.pname}-resources";
     inherit (info) version src;
-
-    cargoArtifacts = cargoDeps;
-
     strictDeps = true;
+    doCheck = false;
+    nativeBuildInputs = tools.frontend;
+    cargoExtraArgs = "--target wasm32-unknown-unknown -p graphite-wasm --no-default-features --features native";
+  };
+  resources = deps.crane.lib.buildPackage (resourcesCommon // {
+    cargoArtifacts = deps.crane.lib.buildDepsOnly resourcesCommon;
 
     # TODO: Remove the need for this hash by using individual package resolutions and hashes from package-lock.json
     npmDeps = pkgs.fetchNpmDeps {
@@ -26,7 +27,6 @@ let
     npmConfigScript = "setup";
     makeCacheWritable = true;
 
-    buildInputs = libs.desktop-all;
     nativeBuildInputs = tools.frontend ++ [ pkgs.npmHooks.npmConfigHook ];
 
     buildPhase = ''
@@ -41,28 +41,29 @@ let
       mkdir -p $out
       cp -r frontend/dist/* $out/
     '';
-
+  });
+  common = {
+    inherit (info) pname version src;
+    strictDeps = true;
+    buildInputs = libs.desktop-all;
+    nativeBuildInputs = tools.desktop ++ [ pkgs.makeWrapper ];
+    env = deps.cef.env;
     doCheck = false;
+    cargoExtraArgs = "-p graphite-desktop${if embeddedResources then "" else " --no-default-features --features recommended"}";
   };
 in
 
-deps.crane.lib.buildPackage {
-  inherit (info) pname version src;
-
-  cargoArtifacts = cargoDeps;
-
-  strictDeps = true;
+deps.crane.lib.buildPackage (common // {
+  cargoArtifacts = deps.crane.lib.buildDepsOnly common;
 
-  buildInputs = libs.desktop-all;
-  nativeBuildInputs = tools.desktop;
-
-  env = deps.cef.env // {
-    EMBEDDED_RESOURCES = resources;
+  env = common.env // {
     GRAPHENE_RASTER_NODES_SHADER_PATH = pkgs.graphene-raster-nodes-shaders;
-  };
+  } // (if embeddedResources then {
+    EMBEDDED_RESOURCES = resources;
+  } else {});
 
   buildPhase = ''
-    cargo build -r -p graphite-desktop
+    cargo build -r ${common.cargoExtraArgs}
   '';
 
   installPhase = ''
@@ -76,11 +77,9 @@ deps.crane.lib.buildPackage {
     cp $src/desktop/assets/graphite-icon-color.svg $out/share/icons/hicolor/scalable/apps/
   '';
 
-  doCheck = false;
-
   postFixup = ''
     wrapProgram "$out/bin/graphite" \
       --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath libs.desktop-all}:${deps.cef.env.CEF_PATH}" \
       --set CEF_PATH "${deps.cef.env.CEF_PATH}"
   '';
-}
+})

desktop/assets/rs.graphite.GraphiteEditor.desktop

@@ -2,7 +2,7 @@
 Name=Graphite
 GenericName=Vector & Raster Graphics Editor
 Comment=Open-source vector & raster graphics editor. Featuring node based procedural nondestructive editing workflow.
-Exec=graphite-editor
+Exec=graphite
 Terminal=false
 Type=Application
 Icon=graphite-icon-color

desktop/embedded-resources/build.rs

@@ -1,16 +1,31 @@
-const RESOURCES: &str = "../../frontend/dist";
+const EMBEDDED_RESOURCES_ENV: &str = "EMBEDDED_RESOURCES";
+const DEFAULT_RESOURCES_DIR: &str = "../../frontend/dist";
 
-// Check if the directory `RESOURCES` exists and sets the embedded_resources cfg accordingly
-// Absolute path of `RESOURCES` available via the `EMBEDDED_RESOURCES` environment variable
 fn main() {
-	let crate_dir = std::path::PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
+	let mut embedded_resources: Option<String> = None;
 
-	println!("cargo:rerun-if-changed={RESOURCES}");
-	if let Ok(resources) = crate_dir.join(RESOURCES).canonicalize()
-		&& resources.exists()
+	println!("cargo:rerun-if-env-changed={EMBEDDED_RESOURCES_ENV}");
+	if let Ok(embedded_resources_env) = std::env::var(EMBEDDED_RESOURCES_ENV)
+		&& std::path::PathBuf::from(&embedded_resources_env).exists()
 	{
+		embedded_resources = Some(embedded_resources_env);
+	}
+
+	if embedded_resources.is_none() {
+		// Check if the directory `DEFAULT_RESOURCES_DIR` exists and sets the embedded_resources cfg accordingly
+		// Absolute path of `DEFAULT_RESOURCES_DIR` available via the `EMBEDDED_RESOURCES` environment variable
+		let crate_dir = std::path::PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
+		println!("cargo:rerun-if-changed={DEFAULT_RESOURCES_DIR}");
+		if let Ok(resources) = crate_dir.join(DEFAULT_RESOURCES_DIR).canonicalize()
+			&& resources.exists()
+		{
+			embedded_resources = Some(resources.to_string_lossy().to_string());
+		}
+	}
+
+	if let Some(embedded_resources) = embedded_resources {
 		println!("cargo:rustc-cfg=embedded_resources");
-		println!("cargo:rustc-env=EMBEDDED_RESOURCES={}", resources.to_string_lossy());
+		println!("cargo:rustc-env={EMBEDDED_RESOURCES_ENV}={embedded_resources}");
 	} else {
 		println!("cargo:warning=Resource directory does not exist. Resources will not be embedded. Did you forget to build the frontend?");
 	}