mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-22 22:14:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Try providing cargo-rust-gpu to nix devs

Browse source
This commit is contained in:
Timon Schelling 2025-08-07 20:19:24 +00:00 • committed by Keavon Chambers
parent 8ae5641d70
commit 89bf226ece
1 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

45
.nix/flake.nix
View file

@ -34,11 +34,48 @@
inherit system overlays; inherit system overlays;
}; };
rustc-wasm = pkgs.rust-bin.stable.latest.default.override { rustExtensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
rust = pkgs.rust-bin.stable.latest.default.override {
targets = [ "wasm32-unknown-unknown" ]; targets = [ "wasm32-unknown-unknown" ];
extensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ]; extensions = rustExtensions;
}; };
rustNightlyPkg = pkgs.rust-bin.nightly."2025-06-23".default.override {
extensions = rustExtensions ++ [ "rustc-dev" "llvm-tools" ];
};
rustPlatformNightly = pkgs.makeRustPlatform {
cargo = rustNightlyPkg;
rustc = rustNightlyPkg;
};
rustc_codegen_spirv = (rustPlatformNightly.buildRustPackage.override {
stdenv = pkgs.llvmPackages.stdenv;
}) (finalAttrs: {
pname = "rustc_codegen_spirv";
version = "0-unstable-2025-08-04";
src = pkgs.fetchFromGitHub {
owner = "Rust-GPU";
repo = "rust-gpu";
rev = "df1628a032d22c864397417c2871b74d602af986";
hash = "sha256-AFt3Nc+NqK8DxNUhDBcOUmk3XDVcoToVeFIMYNszdbY=";
};
cargoHash = "sha256-en3BYJWQabH064xeAwYQrvcr6EuWg/QjvsG+Jd6HHCk";
cargoBuildFlags = [ "-p" "rustc_codegen_spirv" ];
doCheck = false;
});
cargoRustGpuBuild = pkgs.writeShellScriptBin "cargo-rust-gpu" ''
#!${pkgs.bash}/bin/bash
export PATH="${pkgs.lib.makeBinPath [rustNightlyPkg]}"
export RUSTFLAGS="-Zcodegen-backend=${rustc_codegen_spirv}/lib/librustc_codegen_spirv.so"
exec cargo +nightly $@
'';
libcef = pkgs.libcef.overrideAttrs (finalAttrs: previousAttrs: { libcef = pkgs.libcef.overrideAttrs (finalAttrs: previousAttrs: {
version = "139.0.17"; version = "139.0.17";
gitRevision = "6c347eb"; gitRevision = "6c347eb";
@ -85,7 +122,7 @@
# Development tools that don't need to be in LD_LIBRARY_PATH # Development tools that don't need to be in LD_LIBRARY_PATH
buildTools = [ buildTools = [
rustc-wasm rust
pkgs.nodejs pkgs.nodejs
pkgs.nodePackages.npm pkgs.nodePackages.npm
pkgs.binaryen pkgs.binaryen
@ -97,6 +134,8 @@
# Linker # Linker
pkgs.mold pkgs.mold
cargoRustGpuBuild
]; ];
# Development tools that don't need to be in LD_LIBRARY_PATH # Development tools that don't need to be in LD_LIBRARY_PATH
devTools = with pkgs; [ devTools = with pkgs; [