fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 14:18:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Post refactor fixup (#3395)

Browse Source 
* fixup

* fix feature deps for native
This commit is contained in:
Timon
2025-11-18 15:48:45 +00:00
committed by GitHub
parent 6a3b098681
commit 7d739c4542
9 changed files with 13 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.nix/flake.nix
View File

@@ -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

2
.nix/pkgs/graphite.nix
View File

@@ -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

6
.nix/pkgs/graphene-raster-nodes-shaders.nix → .nix/pkgs/raster-nodes-shaders.nix
View File

@@ -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;