Merge branch 'master' into add-median-filter-blur

Author: Keavon

.branding

@@ -0,0 +1,2 @@
+https://github.com/Keavon/graphite-branded-assets/archive/f8b02e68c92f5bbd27626bdd7a51102303b70a40.tar.gz
+d06fd7b79fa9b7509c23072fa56745415fdc6eb98575d15214b0acc47ea4dd42

.github/workflows/build-dev-and-ci.yml

@@ -34,10 +34,10 @@ jobs:
         with:
           node-version: "latest"
 
-      - name: 🚧 Install Node dependencies
+      - name: 🚧 Install build dependencies
         run: |
           cd frontend
-          npm ci
+          npm run setup
 
       - name: 🦀 Install the latest Rust
         run: |

.github/workflows/build-production.yml

@@ -32,10 +32,10 @@ jobs:
         with:
           node-version: "latest"
 
-      - name: 🚧 Install Node dependencies
+      - name: 🚧 Install build dependencies
         run: |
           cd frontend
-          npm ci
+          npm run setup
 
       - name: 🦀 Install the latest Rust
         run: |

.github/workflows/comment-!build-commands.yml

@@ -59,10 +59,10 @@ jobs:
         with:
           node-version: "latest"
 
-      - name: 🚧 Install Node dependencies
+      - name: 🚧 Install build dependencies
         run: |
           cd frontend
-          npm ci
+          npm run setup
 
       - name: 🦀 Install the latest Rust
         run: |

.gitignore

@@ -1,3 +1,4 @@
+branding/
 target/
 result/
 *.spv

.nix/pkgs/graphite.nix

@@ -14,6 +14,22 @@
 }:
 
 let
+  brandingTar = pkgs.fetchurl (
+    let
+      lockContent = builtins.readFile "${info.src}/.branding";
+      lines = builtins.filter (s: s != [ ]) (builtins.split "\n" lockContent);
+      url = builtins.elemAt lines 0;
+      hash = builtins.elemAt lines 1;
+    in
+    {
+      url = url;
+      sha256 = hash;
+    }
+  );
+  branding = pkgs.runCommand "${info.pname}-branding" { } ''
+    mkdir -p $out
+    tar -xvf ${brandingTar} -C $out --strip-components 1
+  '';
   resourcesCommon = {
     pname = "${info.pname}-resources";
     inherit (info) version src;
@@ -32,7 +48,7 @@ let
       npmDeps = pkgs.fetchNpmDeps {
         inherit (info) pname version;
         src = "${info.src}/frontend";
-        hash = "sha256-UWuJpKNYj2Xn34rpMDZ75pzMYUOLQjPeGuJ/QlPbX9A=";
+        hash = "sha256-D8VCNK+Ca3gxO+5wriBn8FszG8/x8n/zM6/MPo9E2j4=";
       };
 
       npmRoot = "frontend";
@@ -41,11 +57,17 @@ let
 
       nativeBuildInputs = tools.frontend ++ [ pkgs.npmHooks.npmConfigHook ];
 
+      prePatch = ''
+        mkdir branding
+        cp -r ${branding}/* branding
+        cp ${info.src}/.branding branding/.branding
+      '';
+
       buildPhase = ''
         export HOME="$TMPDIR"
 
         pushd frontend
-        npm run build-native${if dev then "-dev" else ""}
+        npm run native:build-${if dev then "dev" else "production"}
         popd
       '';
 
@@ -89,6 +111,11 @@ deps.crane.lib.buildPackage (
           { }
       );
 
+    postUnpack = ''
+      mkdir ./branding
+      cp -r ${branding}/* ./branding
+    '';
+
     installPhase = ''
       mkdir -p $out/bin
       cp target/${if dev then "debug" else "release"}/graphite $out/bin/graphite
@@ -97,7 +124,7 @@ deps.crane.lib.buildPackage (
       cp $src/desktop/assets/*.desktop $out/share/applications/
 
       mkdir -p $out/share/icons/hicolor/scalable/apps
-      cp $src/desktop/assets/graphite-icon-color.svg $out/share/icons/hicolor/scalable/apps/
+      cp ${branding}/app-icons/graphite.svg $out/share/icons/hicolor/scalable/apps/
     '';
 
     postFixup = ''

desktop/assets/graphite-icon-color.ico

@@ -5,7 +5,7 @@ Comment=Open-source vector & raster graphics editor. Featuring node based proced
 Exec=graphite
 Terminal=false
 Type=Application
-Icon=graphite-icon-color
+Icon=graphite
 Categories=Graphics;VectorGraphics;RasterGraphics;
 Keywords=graphite;editor;vector;raster;procedural;design;
-StartupWMClass=rs.graphite.GraphiteEditor
+StartupWMClass=rs.graphite.Graphite