Merge branch 'yusdacra/chore/nix' into 'master'

Update Nix deps, add new build and runtime deps to make it work with wgpu

See merge request veloren/veloren!2370

Cargo.toml

@@ -109,6 +109,10 @@ 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" }

flake.lock

@@ -19,11 +19,11 @@
     },
     "devshell": {
       "locked": {
-        "lastModified": 1618523768,
-        "narHash": "sha256-Gev9da35pHUey3kGz/zrJFc/9ICs++vPCho7qB1mqd8=",
+        "lastModified": 1622711433,
+        "narHash": "sha256-rGjXz7FA7HImAT3TtoqwecByLO5yhVPSwPdaYPBFRQw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "709fe4d04a9101c9d224ad83f73416dce71baf21",
+        "rev": "1f4fb67b662b65fa7cfe696fc003fcc1e8f7cc36",
         "type": "github"
       },
       "original": {
@@ -34,11 +34,11 @@
     },
     "flakeUtils": {
       "locked": {
-        "lastModified": 1619345332,
-        "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
+        "lastModified": 1622445595,
+        "narHash": "sha256-m+JRe6Wc5OZ/mKw2bB3+Tl0ZbtyxxxfnAWln8Q5qs+Y=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28",
+        "rev": "7d706970d94bc5559077eb1a6600afddcd25a7c8",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
         "rustOverlay": "rustOverlay"
       },
       "locked": {
-        "lastModified": 1620118463,
-        "narHash": "sha256-Ab15HNEtPz/4FQteuGNT7dUblHdnyNjsw3jB4a/eOPM=",
+        "lastModified": 1622713739,
+        "narHash": "sha256-+X+MJno3JKwrtJxLbl37/0YihznIfjowRyxeEwoFEk0=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "67a96ad47289116fbd2418119795c37519900e4e",
+        "rev": "f383dd1d1915ec1fc38d855fe9351d8f5778211e",
         "type": "github"
       },
       "original": {
@@ -92,11 +92,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1620087579,
-        "narHash": "sha256-wjlA0Le2DvSczmnVE6n//5nWpAoudUV+DFnNNLN67wY=",
+        "lastModified": 1622368643,
+        "narHash": "sha256-/BEAmTreS2JjRvnuNNr65tA20FWcRsonURKfYdJecJA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aebebb5752952d5543eebdf012c21d0dc6859217",
+        "rev": "774fe1878b045411e6bdd0dd90d8581e82b10993",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     "preCommitHooks": {
       "flake": false,
       "locked": {
-        "lastModified": 1619976063,
-        "narHash": "sha256-2tjVP95+qR1UzL8/UeV/xRJu7S2fRB7rf7enZedbrik=",
+        "lastModified": 1622650193,
+        "narHash": "sha256-qSzUpJDv04ajS9FXoCq6NjVF3qOt9IiGIiGh0P8amyw=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "09fb9e425111878b58223852e87ed85e8a189e0d",
+        "rev": "0398f0649e0a741660ac5e8216760bae5cc78579",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     "rustOverlay": {
       "flake": false,
       "locked": {
-        "lastModified": 1620095001,
-        "narHash": "sha256-U9krnAybhFQlwbFTjxRPQ/1DRXOu/3dmq2GOsihRMUo=",
+        "lastModified": 1622689331,
+        "narHash": "sha256-b8c0t2Uo4uk7DNhSfhFDpqzY/w/tIUgBut5Ug1Pl6DU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "916d7e608dd171123e1e2774e083813ff9abe831",
+        "rev": "7ad7640ad12ff6b0af4f96bffd95175ad0898d49",
         "type": "github"
       },
       "original": {

voxygen/Cargo.toml

@@ -18,7 +18,7 @@ It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild,
 
 This package includes the official client, Voxygen.
 """
-runtimeLibs = ["libGL", "xorg.libX11", "xorg.libXcursor", "xorg.libXrandr", "xorg.libXi"]
+runtimeLibs = ["libGL", "xorg.libX11", "xorg.libXcursor", "xorg.libXrandr", "xorg.libXi", "vulkan-loader", "vulkan-validation-layers", "vulkan-extension-layer"]
 buildInputs = ["xorg.libxcb"]
 
 [features]