desktop simple nix ci

Author: timon-schelling

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

@@ -0,0 +1,18 @@
+name: Build Nix Package
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    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 Dev
+        run: nix build .nix#graphite-dev --print-build-logs

.nix/cef.nix renamed to .nix/deps/cef.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, inputs, ... }:
 
 let
   libcef = pkgs.libcef.overrideAttrs (_: _: {
@@ -22,5 +22,5 @@ let
   '';
 in
 {
-  CEF_PATH = cefPath;
+  env.CEF_PATH = cefPath;
 }

.nix/deps/crane.nix

@@ -0,0 +1,5 @@
+{ pkgs, inputs, ... }:
+
+{
+  lib = inputs.crane.mkLib pkgs;
+}

.nix/rust-gpu.nix renamed to .nix/deps/rust-gpu.nix

@@ -1,15 +1,24 @@
-{ pkgs }:
+{ pkgs, inputs, ... }:
 
 let
-  toolchainPkg = pkgs.rust-bin.nightly."2025-06-23".default.override {
-    extensions =
-      [ "rust-src" "rust-analyzer" "clippy" "cargo" "rustc-dev" "llvm-tools" ];
+  extensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" "rustc-dev" "llvm-tools" ];
+  toolchain = pkgs.rust-bin.nightly."2025-06-23".default.override {
+    inherit extensions;
   };
-  toolchainRustPlatform = pkgs.makeRustPlatform {
-    cargo = toolchainPkg;
-    rustc = toolchainPkg;
-  };
-  rustc_codegen_spirv = toolchainRustPlatform.buildRustPackage (finalAttrs: {
+  cargo = pkgs.writeShellScriptBin "cargo" ''
+    #!${pkgs.lib.getExe pkgs.bash}
+
+    filtered_args=()
+    for arg in "$@"; do
+      case "$arg" in
+        +nightly|+nightly-*) ;;
+        *) filtered_args+=("$arg") ;;
+      esac
+    done
+
+    exec ${toolchain}/bin/cargo ${"\${filtered_args[@]}"}
+  '';
+  rustc_codegen_spirv = (pkgs.makeRustPlatform { cargo = toolchain; rustc = toolchain; }).buildRustPackage (finalAttrs: {
     pname = "rustc_codegen_spirv";
     version = "0-unstable-2025-08-04";
     src = pkgs.fetchFromGitHub {
@@ -27,21 +36,11 @@ let
     ];
     doCheck = false;
   });
-  cargoWrapper = pkgs.writeShellScriptBin "cargo" ''
-    #!${pkgs.lib.getExe pkgs.bash}
-
-    filtered_args=()
-    for arg in "$@"; do
-      case "$arg" in
-        +nightly|+nightly-*) ;;
-        *) filtered_args+=("$arg") ;;
-      esac
-    done
-
-    exec ${toolchainPkg}/bin/cargo ${"\${filtered_args[@]}"}
-  '';
-in {
-  RUST_GPU_PATH_OVERRIDE = "${cargoWrapper}/bin:${toolchainPkg}/bin";
-  RUSTC_CODEGEN_SPIRV_PATH =
-    "${rustc_codegen_spirv}/lib/librustc_codegen_spirv.so";
+in
+{
+  toolchain = toolchain;
+  env = {
+    RUST_GPU_PATH_OVERRIDE = "${cargo}/bin:${toolchain}/bin";
+    RUSTC_CODEGEN_SPIRV_PATH = "${rustc_codegen_spirv}/lib/librustc_codegen_spirv.so";
+  };
 }

.nix/dev.nix

@@ -0,0 +1,12 @@
+{ info, pkgs, inputs, deps, libs, tools, ... }:
+
+pkgs.mkShell ({
+  packages = tools.all;
+
+  LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath libs.desktop-all}:${deps.cef.env.CEF_PATH}";
+  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/flake.lock

@@ -19,52 +19,68 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
+    crane.url = "github:ipetkov/crane";
 
     # 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, rust-overlay, flake-utils, ... }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        overlays = [ (import rust-overlay) ];
-        pkgs = import nixpkgs { inherit system overlays; };
-
-        rustExtensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
-        rust = pkgs.rust-bin.stable.latest.default.override {
-          targets = [ "wasm32-unknown-unknown" ];
-          extensions = rustExtensions;
-        };
-
-        # Shared build inputs; libraries that need to be in LD_LIBRARY_PATH
-        buildInputs = [
+  outputs = inputs: inputs.flake-utils.lib.eachDefaultSystem (system:
+    let
+      info = {
+        pname = "graphite";
+        version = "unstable";
+        src = ./..;
+      };
+
+      pkgs = import inputs.nixpkgs {
+        inherit system;
+        overlays = [ (import inputs.rust-overlay) ];
+      };
+
+      deps = {
+        rust = import ./deps/rust.nix { inherit pkgs inputs; };
+        crane = import ./deps/crane.nix { inherit pkgs inputs; };
+        cef = import ./deps/cef.nix { inherit pkgs inputs; };
+        rustGPU = import ./deps/rust-gpu.nix { inherit pkgs inputs; };
+      };
+
+      libs = rec {
+        desktop = [
           pkgs.wayland
           pkgs.openssl
           pkgs.vulkan-loader
           pkgs.libraw
           pkgs.libGL
-
-          # X11 libraries, not needed on wayland! Remove when x11 is finally dead
+        ];
+        desktop-x11 = [
           pkgs.libxkbcommon
           pkgs.xorg.libXcursor
           pkgs.xorg.libxcb
           pkgs.xorg.libX11
         ];
+        desktop-all = desktop ++ desktop-x11;
+      };
 
-        # Packages needed to build the package
-        buildTools = [
-          rust
+      tools = rec {
+        desktop = [
+          pkgs.pkg-config
+        ];
+        frontend = [
+          pkgs.lld
           pkgs.nodejs
           pkgs.nodePackages.npm
           pkgs.binaryen
           pkgs.wasm-bindgen-cli_0_2_100
           pkgs.wasm-pack
-          pkgs.pkg-config
           pkgs.cargo-about
         ];
+        dev = [
+          pkgs.rustc
+          pkgs.cargo
+          pkgs.rust-analyzer
+          pkgs.clippy
 
-        # Development tools; not needed to build the package
-        devTools = [
           pkgs.git
 
           pkgs.cargo-watch
@@ -79,81 +95,26 @@
           pkgs.samply
           pkgs.cargo-flamegraph
         ];
-
-        cefEnv = import ./cef.nix { inherit pkgs; };
-        rustGPUEnv = import ./rust-gpu.nix { inherit pkgs; };
-
-        libPath = "${pkgs.lib.makeLibraryPath buildInputs}:${cefEnv.CEF_PATH}";
-      in {
-        devShells.default = pkgs.mkShell ({
-          packages = buildInputs ++ buildTools ++ devTools;
-
-          LD_LIBRARY_PATH = libPath;
-          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'
-          '';
-        } // cefEnv // rustGPUEnv);
-
-        packages.default = pkgs.rustPlatform.buildRustPackage (finalAttrs: {
-          pname = "graphite-editor";
-          version = "unstable";
-          src = pkgs.lib.cleanSource ./..;
-
-          cargoLock = {
-            lockFile = ../Cargo.lock;
-            allowBuiltinFetchGit = true;
-          };
-
-          # TODO: Remove the need for this hash by using individual package resolutions and hashes from package-lock.json
-          npmDeps = pkgs.fetchNpmDeps {
-            inherit (finalAttrs) pname version;
-            src = "${finalAttrs.src}/frontend";
-            hash = "sha256-UWuJpKNYj2Xn34rpMDZ75pzMYUOLQjPeGuJ/QlPbX9A=";
-          };
-
-          npmRoot = "frontend";
-          npmConfigScript = "setup";
-          makeCacheWritable = true;
-
-          buildInputs = buildInputs;
-          nativeBuildInputs = buildTools ++ [
-            pkgs.rustPlatform.cargoSetupHook
-            pkgs.npmHooks.npmConfigHook
-            pkgs.makeWrapper
-          ];
-
-          env = cefEnv // rustGPUEnv;
-
-          buildPhase = ''
-            export HOME="$TMPDIR"
-
-            pushd frontend
-            npm run build-native
-            popd
-            cargo build -r -p graphite-desktop
-          '';
-
-          installPhase = ''
-            mkdir -p $out/bin
-            cp target/release/graphite-desktop $out/bin/graphite-editor
-
-            mkdir -p $out/share/applications
-            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/
-          '';
-
-          doCheck = false;
-
-          postFixup = ''
-            wrapProgram "$out/bin/graphite-editor" \
-              --prefix LD_LIBRARY_PATH : "${libPath}" \
-              --set CEF_PATH "${cefEnv.CEF_PATH}"
-          '';
-        });
-      });
+        all = frontend ++ dev;
+      };
+    in
+    {
+      packages = rec {
+        graphiteWithArgs = args: (import ./pkgs/graphite.nix {
+          pkgs = pkgs // { inherit graphene-raster-nodes-shaders; };
+          inherit info inputs deps libs tools;
+        }) args;
+        graphite = graphiteWithArgs { };
+        graphite-dev = graphiteWithArgs { dev = true; };
+        graphite-without-resources = graphiteWithArgs { embeddedResources = false; };
+        graphite-without-resources-dev = graphiteWithArgs { embeddedResources = false; 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 { inherit info pkgs inputs deps libs tools; };
+
+        default = graphite;
+      };
+
+      devShells.default = import ./dev.nix { inherit pkgs deps libs tools; };
+    }
+  );
 }

.nix/flake.nix

@@ -0,0 +1,28 @@
+{ info, pkgs, deps, libs, tools, ... }:
+
+(deps.crane.lib.overrideToolchain (_: deps.rustGPU.toolchain)).buildPackage {
+  pname = "graphene-raster-nodes-shaders";
+  inherit (info) version src;
+
+  cargoVendorDir = deps.crane.lib.vendorMultipleCargoDeps {
+    inherit (deps.crane.lib.findCargoFiles (deps.crane.lib.cleanCargoSource info.src)) cargoConfigs;
+    cargoLockList = [
+      "${info.src}/Cargo.lock"
+      "${deps.rustGPU.toolchain.passthru.availableComponents.rust-src}/lib/rustlib/src/rust/library/Cargo.lock"
+    ];
+  };
+
+  strictDeps = true;
+
+  env = deps.rustGPU.env;
+
+  buildPhase = ''
+    cargo build -r -p graphene-raster-nodes-shaders
+  '';
+
+  installPhase = ''
+    cp target/spirv-builder/spirv-unknown-naga-wgsl/release/deps/graphene_raster_nodes_shaders_entrypoint.wgsl $out
+  '';
+
+  doCheck = false;
+}