Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

build(nix): fix shaderc lib

Browse Source
This commit is contained in:
Yusuf Bera Ertan 2021-06-13 19:09:10 +03:00
parent faf5b3fc9c
commit fd480fdfbc
No known key found for this signature in database
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

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

6
flake.nix
View File

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