Merge branch 'yusdacra/fix-nixshell' into 'master'

Fix shell.nix build

See merge request veloren/veloren!1078
This commit is contained in:
Imbris 2020-06-14 17:28:26 +00:00
commit 0d570ffc27
2 changed files with 3 additions and 1 deletions

View File

@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec {
#preConfigure = "export HOME=`mktemp -d`";
postInstall = "cp -R $src/assets $out/bin/assets";
# If veloren-vendor build fails with hash mismatch, change this hash with `got:` hash
cargoSha256 = "0715pic4fsbacpv5pz67hyp1sqqw3z41rxn4y5hgjdqaw8a4blq2";
cargoSha256 = "13aa2jypqhg4y7bpkxqdchd0sw85hq6galafswbg1d4bjwphnq70";
meta = {
platforms = stdenv.lib.platforms.linux;

View File

@ -27,6 +27,8 @@ import ./default.nix {
"voxygen/src/main.rs"
"world/Cargo.toml"
"world/src/lib.rs"
"network/Cargo.toml"
"network/src/lib.rs"
]
);
}