diff --git a/Cargo.lock b/Cargo.lock
index 3132f6e3fc..87d0becd56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2718,7 +2718,7 @@ dependencies = [
 [[package]]
 name = "keyboard-keynames"
 version = "0.1.0"
-source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=9ae8f89014d0b0c5b61d0e821c5aeb6140c5c0dc#9ae8f89014d0b0c5b61d0e821c5aeb6140c5c0dc"
+source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=721c8b301f8003332d0cc767ab2649fdd330e842#721c8b301f8003332d0cc767ab2649fdd330e842"
 dependencies = [
  "libc",
  "memmap",
@@ -2726,7 +2726,7 @@ dependencies = [
  "winapi 0.3.9",
  "winit",
  "xcb",
- "xkbcommon-sys 0.7.5 (git+https://github.com/Frinksy/rust-xkbcommon-sys.git?rev=d5d69e05a81f7ee8d2f65a824ae692610ed7cb14)",
+ "xkbcommon-sys 0.7.6",
 ]
 
 [[package]]
@@ -3063,7 +3063,7 @@ dependencies = [
  "winapi 0.3.9",
  "x11-dl",
  "xkb",
- "xkbcommon-sys 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xkbcommon-sys 0.7.5",
 ]
 
 [[package]]
@@ -7082,7 +7082,7 @@ checksum = "aec02bc5de902aa579f3d2f2c522edaf40fa42963cbaffe645b058ddcc68fdb2"
 dependencies = [
  "bitflags",
  "libc",
- "xkbcommon-sys 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xkbcommon-sys 0.7.5",
 ]
 
 [[package]]
@@ -7098,8 +7098,8 @@ dependencies = [
 
 [[package]]
 name = "xkbcommon-sys"
-version = "0.7.5"
-source = "git+https://github.com/Frinksy/rust-xkbcommon-sys.git?rev=d5d69e05a81f7ee8d2f65a824ae692610ed7cb14#d5d69e05a81f7ee8d2f65a824ae692610ed7cb14"
+version = "0.7.6"
+source = "git+https://github.com/Frinksy/rust-xkbcommon-sys.git?rev=8f615dd6cd90a4ab77c45627830dde49b592b9b5#8f615dd6cd90a4ab77c45627830dde49b592b9b5"
 dependencies = [
  "libc",
  "pkg-config",
diff --git a/flake.lock b/flake.lock
index 9c1d6b3ff6..196d6d02bb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,11 +24,11 @@
         "rustOverlay": "rustOverlay"
       },
       "locked": {
-        "lastModified": 1627752074,
-        "narHash": "sha256-iuOGIbJC4hn1XqwrBjiol6j0Xj+AImND6Z9fP/6Za74=",
+        "lastModified": 1627940369,
+        "narHash": "sha256-KtY837WKsX9B/pIKFDKzN0wl1t3et1JZjMjGa7SAZxI=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "47e6414440c66bfd44a0ea07d64ca62075470f62",
+        "rev": "fac8518469e226db4805ff80788979c847b0c322",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1627533199,
-        "narHash": "sha256-NyIUcNevwtsMBINn56jnDF8wz3TV1AFxw+Vw6JMnkyE=",
+        "lastModified": 1627814220,
+        "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dd98b100651cfbb8804f32d852f75ef7c97a6b74",
+        "rev": "ab5b6828af26215bf2646c31961da5d3749591ef",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     "rustOverlay": {
       "flake": false,
       "locked": {
-        "lastModified": 1627697717,
-        "narHash": "sha256-ij7rk2VkPpNf0NTbpP5jfbwuIWfrLXN00pZ+pizGnGM=",
+        "lastModified": 1627870491,
+        "narHash": "sha256-0Myg04QOIcTN1RhgfRNx0i/iCRyVyf/Z6rJxZUmot5k=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "6d957c2105a5a548211c412fbc97bae81b7b8eb6",
+        "rev": "71d825269cfaa30605d058bd92381be9af87b0be",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b6d8c63207..8f121f9fda 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,16 +67,10 @@
             # 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;
             };
-            veloren-i18n = oldAttrs: {
+            veloren-voxygen-i18n = oldAttrs: {
               crateBin = lib.filter (bin: bin.name != "i18n-check") oldAttrs.crateBin;
             };
             veloren-common = oldAttrs: {
diff --git a/nix/README.md b/nix/README.md
index 5bc94b991c..5ee218f80b 100644
--- a/nix/README.md
+++ b/nix/README.md
@@ -22,6 +22,11 @@ git lfs install --local && git lfs fetch && git lfs checkout
 ```
 This should be automatically done if you use the development shell.
 
+If you get an issue such as `WARN gfx_backend_vulkan: Unable to create Vulkan instance: VkError(ERROR_INCOMPATIBLE_DRIVER)`,
+it might be that your system nixpkgs version and veloren repo nixpkgs version might be too far apart. In that case, you can try
+changing your system nixpkgs to the unstable channel, or change the `nixpkgs` input in the `flake.nix` to match your system
+nixpkgs.
+
 ## Usage for players
 
 ### With flakes
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 6ded232b41..eab7fa4639 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -65,7 +65,7 @@ iced = {package = "iced_native", git = "https://github.com/Imberflur/iced", tag
 iced_winit = {git = "https://github.com/Imberflur/iced", tag = "winit-0.25"}
 window_clipboard = "0.2"
 glyph_brush = "0.7.0"
-keyboard-keynames = { git = "https://gitlab.com/Frinksy/keyboard-keynames.git", rev = "9ae8f89014d0b0c5b61d0e821c5aeb6140c5c0dc" }
+keyboard-keynames = { git = "https://gitlab.com/Frinksy/keyboard-keynames.git", rev = "721c8b301f8003332d0cc767ab2649fdd330e842" }
 
 # EGUI
 egui = {version = "0.12", optional = true }