diff --git a/Cargo.toml b/Cargo.toml index 88c76c276e..bd0e04061c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -109,10 +109,6 @@ key = "veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc=" buildInputs = ["openssl"] nativeBuildInputs = ["pkg-config"] -[workspace.metadata.nix.crateOverride.shaderc-sys] -buildInputs = ["shaderc"] -nativeBuildInputs = ["cmake", "python3", "gnumake"] - [patch.crates-io] # macos CI fix isn't released yet winit = { git = "https://gitlab.com/veloren/winit.git", branch = "macos-test-spiffed" } diff --git a/flake.nix b/flake.nix index a34463137d..9a7353e892 100644 --- a/flake.nix +++ b/flake.nix @@ -60,6 +60,12 @@ # veloren-world = oldAttrs: { # crateBin = lib.filter (bin: bin.name != "chunk_compression_benchmarks") oldAttrs.crateBin; # }; + shaderc-sys = _: + let SHADERC_LIB_DIR = "${common.pkgs.shaderc.lib}/lib"; in + { + inherit SHADERC_LIB_DIR; + propagatedEnv = { inherit SHADERC_LIB_DIR; }; + }; veloren-client = oldAttrs: { crateBin = lib.filter (bin: bin.name != "bot") oldAttrs.crateBin; };