mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-10-01 14:18:12 +08:00
Reduce Nix flake maintanace by eliminating need for cargoHash bumps (#3292)
* prepare nix for hashless cargo builds, update rust-gpu to non-orphaned commit * match commit hashes to repos, update packages to make nix flake build properly * add nix build dir to gitignore * Add npm TODO to flake.nix * Update Cargo.lock * Update TODO comment
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
target/
|
target/
|
||||||
|
result/
|
||||||
*.spv
|
*.spv
|
||||||
*.exrc
|
*.exrc
|
||||||
perf.data*
|
perf.data*
|
||||||
|
|||||||
+15
-14
@@ -28,9 +28,7 @@
|
|||||||
flake-utils.lib.eachDefaultSystem (system:
|
flake-utils.lib.eachDefaultSystem (system:
|
||||||
let
|
let
|
||||||
overlays = [ (import rust-overlay) ];
|
overlays = [ (import rust-overlay) ];
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs { inherit system overlays; };
|
||||||
inherit system overlays;
|
|
||||||
};
|
|
||||||
|
|
||||||
rustExtensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
|
rustExtensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
|
||||||
rust = pkgs.rust-bin.stable.latest.default.override {
|
rust = pkgs.rust-bin.stable.latest.default.override {
|
||||||
@@ -54,12 +52,12 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
# Packages needed to build the package
|
# Packages needed to build the package
|
||||||
buildTools = [
|
buildTools = [
|
||||||
rust
|
rust
|
||||||
pkgs.nodejs
|
pkgs.nodejs
|
||||||
pkgs.nodePackages.npm
|
pkgs.nodePackages.npm
|
||||||
pkgs.binaryen
|
pkgs.binaryen
|
||||||
pkgs.wasm-bindgen-cli
|
pkgs.wasm-bindgen-cli_0_2_100
|
||||||
pkgs.wasm-pack
|
pkgs.wasm-pack
|
||||||
pkgs.pkg-config
|
pkgs.pkg-config
|
||||||
pkgs.cargo-about
|
pkgs.cargo-about
|
||||||
@@ -86,29 +84,31 @@
|
|||||||
rustGPUEnv = import ./rust-gpu.nix { inherit pkgs; };
|
rustGPUEnv = import ./rust-gpu.nix { inherit pkgs; };
|
||||||
|
|
||||||
libPath = "${pkgs.lib.makeLibraryPath buildInputs}:${cefEnv.CEF_PATH}";
|
libPath = "${pkgs.lib.makeLibraryPath buildInputs}:${cefEnv.CEF_PATH}";
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
devShells.default = pkgs.mkShell ({
|
devShells.default = pkgs.mkShell ({
|
||||||
packages = buildInputs ++ buildTools ++ devTools;
|
packages = buildInputs ++ buildTools ++ devTools;
|
||||||
|
|
||||||
LD_LIBRARY_PATH = libPath;
|
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";
|
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 = ''
|
shellHook = ''
|
||||||
alias cargo='mold --run cargo'
|
alias cargo='mold --run cargo'
|
||||||
'';
|
'';
|
||||||
} // cefEnv // rustGPUEnv);
|
} // cefEnv // rustGPUEnv);
|
||||||
|
|
||||||
packages.default = pkgs.stdenv.mkDerivation(finalAttrs: {
|
packages.default = pkgs.rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "graphite-editor";
|
pname = "graphite-editor";
|
||||||
version = "unstable";
|
version = "unstable";
|
||||||
src = pkgs.lib.cleanSource ./..;
|
src = pkgs.lib.cleanSource ./..;
|
||||||
|
|
||||||
cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
|
cargoLock = {
|
||||||
src = finalAttrs.src;
|
lockFile = ../Cargo.lock;
|
||||||
hash = "sha256-BVIQIZbGW19Rof0J7U2r6XFCUC52hb7+uaE1di4bV4A=";
|
allowBuiltinFetchGit = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
# TODO: Remove the need for this hash by using individual package resolutions and hashes from package-lock.json
|
||||||
npmDeps = pkgs.fetchNpmDeps {
|
npmDeps = pkgs.fetchNpmDeps {
|
||||||
inherit (finalAttrs) pname version;
|
inherit (finalAttrs) pname version;
|
||||||
src = "${finalAttrs.src}/frontend";
|
src = "${finalAttrs.src}/frontend";
|
||||||
@@ -145,12 +145,13 @@
|
|||||||
cp $src/desktop/assets/graphite-icon-color.svg $out/share/icons/hicolor/scalable/apps/
|
cp $src/desktop/assets/graphite-icon-color.svg $out/share/icons/hicolor/scalable/apps/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram "$out/bin/graphite-editor" \
|
wrapProgram "$out/bin/graphite-editor" \
|
||||||
--prefix LD_LIBRARY_PATH : "${libPath}" \
|
--prefix LD_LIBRARY_PATH : "${libPath}" \
|
||||||
--set CEF_PATH "${cefEnv.CEF_PATH}"
|
--set CEF_PATH "${cefEnv.CEF_PATH}"
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
}
|
});
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-7
@@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
toolchainPkg = pkgs.rust-bin.nightly."2025-06-23".default.override {
|
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" ];
|
||||||
};
|
};
|
||||||
toolchainRustPlatform = pkgs.makeRustPlatform {
|
toolchainRustPlatform = pkgs.makeRustPlatform {
|
||||||
cargo = toolchainPkg;
|
cargo = toolchainPkg;
|
||||||
@@ -12,13 +13,18 @@ let
|
|||||||
pname = "rustc_codegen_spirv";
|
pname = "rustc_codegen_spirv";
|
||||||
version = "0-unstable-2025-08-04";
|
version = "0-unstable-2025-08-04";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "Rust-GPU";
|
owner = "Firestar99";
|
||||||
repo = "rust-gpu";
|
repo = "rust-gpu-new";
|
||||||
rev = "c12f216121820580731440ee79ebc7403d6ea04f";
|
rev = "c12f216121820580731440ee79ebc7403d6ea04f";
|
||||||
hash = "sha256-rG1cZvOV0vYb1dETOzzbJ0asYdE039UZImobXZfKIno=";
|
hash = "sha256-rG1cZvOV0vYb1dETOzzbJ0asYdE039UZImobXZfKIno=";
|
||||||
};
|
};
|
||||||
cargoHash = "sha256-AEigcEc5wiBd3zLqWN/2HSbkfOVFneAqNvg9HsouZf4=";
|
cargoHash = "sha256-AEigcEc5wiBd3zLqWN/2HSbkfOVFneAqNvg9HsouZf4=";
|
||||||
cargoBuildFlags = [ "-p" "rustc_codegen_spirv" "--features=use-compiled-tools" "--no-default-features" ];
|
cargoBuildFlags = [
|
||||||
|
"-p"
|
||||||
|
"rustc_codegen_spirv"
|
||||||
|
"--features=use-compiled-tools"
|
||||||
|
"--no-default-features"
|
||||||
|
];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
});
|
});
|
||||||
cargoWrapper = pkgs.writeShellScriptBin "cargo" ''
|
cargoWrapper = pkgs.writeShellScriptBin "cargo" ''
|
||||||
@@ -34,8 +40,8 @@ let
|
|||||||
|
|
||||||
exec ${toolchainPkg}/bin/cargo ${"\${filtered_args[@]}"}
|
exec ${toolchainPkg}/bin/cargo ${"\${filtered_args[@]}"}
|
||||||
'';
|
'';
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
RUST_GPU_PATH_OVERRIDE = "${cargoWrapper}/bin:${toolchainPkg}/bin";
|
RUST_GPU_PATH_OVERRIDE = "${cargoWrapper}/bin:${toolchainPkg}/bin";
|
||||||
RUSTC_CODEGEN_SPIRV_PATH = "${rustc_codegen_spirv}/lib/librustc_codegen_spirv.so";
|
RUSTC_CODEGEN_SPIRV_PATH =
|
||||||
|
"${rustc_codegen_spirv}/lib/librustc_codegen_spirv.so";
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+25
-25
@@ -648,7 +648,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "cargo-gpu"
|
name = "cargo-gpu"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/rust-gpu/cargo-gpu?rev=3952a22d16edbd38689f3a876e417899f21e1fe7#3952a22d16edbd38689f3a876e417899f21e1fe7"
|
source = "git+https://github.com/Firestar99/cargo-gpu?rev=3952a22d16edbd38689f3a876e417899f21e1fe7#3952a22d16edbd38689f3a876e417899f21e1fe7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"cargo_metadata",
|
"cargo_metadata",
|
||||||
@@ -1245,7 +1245,7 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"option-ext",
|
"option-ext",
|
||||||
"redox_users",
|
"redox_users",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1317,7 +1317,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "dpi"
|
name = "dpi"
|
||||||
version = "0.1.2"
|
version = "0.1.2"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
@@ -1461,7 +1461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
|
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4373,7 +4373,7 @@ dependencies = [
|
|||||||
"once_cell",
|
"once_cell",
|
||||||
"socket2",
|
"socket2",
|
||||||
"tracing",
|
"tracing",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4794,7 +4794,7 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "rustc_codegen_spirv-target-specs"
|
name = "rustc_codegen_spirv-target-specs"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
source = "git+https://github.com/rust-gpu/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f"
|
source = "git+https://github.com/Rust-GPU/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#3f05f5482824e3b1fbb44c9ef90a8795a0204c7c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"strum 0.27.2",
|
"strum 0.27.2",
|
||||||
@@ -4804,7 +4804,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "rustc_codegen_spirv-types"
|
name = "rustc_codegen_spirv-types"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
source = "git+https://github.com/rust-gpu/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f"
|
source = "git+https://github.com/Rust-GPU/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#3f05f5482824e3b1fbb44c9ef90a8795a0204c7c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"rspirv",
|
"rspirv",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -4822,7 +4822,7 @@ dependencies = [
|
|||||||
"errno",
|
"errno",
|
||||||
"libc",
|
"libc",
|
||||||
"linux-raw-sys",
|
"linux-raw-sys",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -5328,7 +5328,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "spirv-builder"
|
name = "spirv-builder"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
source = "git+https://github.com/rust-gpu/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f"
|
source = "git+https://github.com/Rust-GPU/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#3f05f5482824e3b1fbb44c9ef90a8795a0204c7c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cargo_metadata",
|
"cargo_metadata",
|
||||||
"clap",
|
"clap",
|
||||||
@@ -5347,7 +5347,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "spirv-std"
|
name = "spirv-std"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
source = "git+https://github.com/rust-gpu/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f"
|
source = "git+https://github.com/Firestar99/rust-gpu-new?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 1.3.2",
|
"bitflags 1.3.2",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
@@ -5361,7 +5361,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "spirv-std-macros"
|
name = "spirv-std-macros"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
source = "git+https://github.com/rust-gpu/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f"
|
source = "git+https://github.com/Firestar99/rust-gpu-new?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -5372,7 +5372,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "spirv-std-types"
|
name = "spirv-std-types"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
source = "git+https://github.com/rust-gpu/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f"
|
source = "git+https://github.com/Firestar99/rust-gpu-new?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "stable_deref_trait"
|
name = "stable_deref_trait"
|
||||||
@@ -5586,7 +5586,7 @@ dependencies = [
|
|||||||
"getrandom 0.3.3",
|
"getrandom 0.3.3",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"rustix",
|
"rustix",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -6780,7 +6780,7 @@ version = "0.1.10"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
|
checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -7163,7 +7163,7 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit"
|
name = "winit"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
"cfg_aliases",
|
"cfg_aliases",
|
||||||
@@ -7190,7 +7190,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-android"
|
name = "winit-android"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"android-activity",
|
"android-activity",
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
@@ -7205,7 +7205,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-appkit"
|
name = "winit-appkit"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
"block2",
|
"block2",
|
||||||
@@ -7227,7 +7227,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-common"
|
name = "winit-common"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"memmap2",
|
"memmap2",
|
||||||
"objc2",
|
"objc2",
|
||||||
@@ -7242,7 +7242,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-core"
|
name = "winit-core"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
"cursor-icon",
|
"cursor-icon",
|
||||||
@@ -7257,7 +7257,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-orbital"
|
name = "winit-orbital"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
"dpi",
|
"dpi",
|
||||||
@@ -7272,7 +7272,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-uikit"
|
name = "winit-uikit"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
"block2",
|
"block2",
|
||||||
@@ -7293,7 +7293,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-wayland"
|
name = "winit-wayland"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
@@ -7319,7 +7319,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-web"
|
name = "winit-web"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atomic-waker",
|
"atomic-waker",
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
@@ -7341,7 +7341,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-win32"
|
name = "winit-win32"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
"cursor-icon",
|
"cursor-icon",
|
||||||
@@ -7357,7 +7357,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-x11"
|
name = "winit-x11"
|
||||||
version = "0.30.12"
|
version = "0.30.12"
|
||||||
source = "git+https://github.com/rust-windowing/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
source = "git+https://github.com/timon-schelling/winit.git?rev=37221c7192ef1deec022a2278e54429331c01bad#37221c7192ef1deec022a2278e54429331c01bad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.3",
|
"bitflags 2.9.3",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
|
|||||||
+3
-3
@@ -132,7 +132,7 @@ web-sys = { version = "=0.3.77", features = [
|
|||||||
"HtmlImageElement",
|
"HtmlImageElement",
|
||||||
"ImageBitmapRenderingContext",
|
"ImageBitmapRenderingContext",
|
||||||
] }
|
] }
|
||||||
winit = { git = "https://github.com/rust-windowing/winit.git", rev = "37221c7192ef1deec022a2278e54429331c01bad" }
|
winit = { git = "https://github.com/timon-schelling/winit.git", rev = "37221c7192ef1deec022a2278e54429331c01bad" }
|
||||||
url = "2.5"
|
url = "2.5"
|
||||||
tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt"] }
|
tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt"] }
|
||||||
vello = { git = "https://github.com/linebender/vello.git", rev = "87cc5bee6d3a34d15017dbbb58634ddc7f33ff9b" } # TODO switch back to stable when a release is made
|
vello = { git = "https://github.com/linebender/vello.git", rev = "87cc5bee6d3a34d15017dbbb58634ddc7f33ff9b" } # TODO switch back to stable when a release is made
|
||||||
@@ -195,8 +195,8 @@ open = "5.3"
|
|||||||
poly-cool = "0.3"
|
poly-cool = "0.3"
|
||||||
spin = "0.10"
|
spin = "0.10"
|
||||||
clap = "4.5"
|
clap = "4.5"
|
||||||
spirv-std = { git = "https://github.com/rust-gpu/rust-gpu", rev = "c12f216121820580731440ee79ebc7403d6ea04f", features = ["bytemuck"] }
|
spirv-std = { git = "https://github.com/Firestar99/rust-gpu-new", rev = "c12f216121820580731440ee79ebc7403d6ea04f", features = ["bytemuck"] }
|
||||||
cargo-gpu = { git = "https://github.com/rust-gpu/cargo-gpu", rev = "3952a22d16edbd38689f3a876e417899f21e1fe7", default-features = false }
|
cargo-gpu = { git = "https://github.com/Firestar99/cargo-gpu", rev = "3952a22d16edbd38689f3a876e417899f21e1fe7", default-features = false }
|
||||||
|
|
||||||
[workspace.lints.rust]
|
[workspace.lints.rust]
|
||||||
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
|
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
|
||||||
|
|||||||
Reference in New Issue
Block a user