diff --git a/nix/common.nix b/nix/common.nix index e52ec4e995..5954c2042a 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -28,6 +28,7 @@ with pkgs; alsa-sys = makeDeps [ alsaLib ] [ pkg-config ]; veloren-network = makeDeps [ openssl ] [ pkg-config ]; veloren-voxygen = makeDeps [ xorg.libxcb ] [ ]; + xcb = makeDeps [ ] [ python3 ]; }; # deps that voxygen needs to function # FIXME: Wayland doesn't work (adding libxkbcommon, wayland and wayland-protocols results in a panic) diff --git a/nix/veloren.nix b/nix/veloren.nix index 7447e639a9..68418634ae 100644 --- a/nix/veloren.nix +++ b/nix/veloren.nix @@ -71,11 +71,8 @@ let veloren-crates = with pkgs; callPackage ./Cargo.nix { - defaultCrateOverrides = with common; + defaultCrateOverrides = with common; with crateDeps; defaultCrateOverrides // { - libudev-sys = _: crateDeps.libudev-sys; - alsa-sys = _: crateDeps.alsa-sys; - veloren-network = _: crateDeps.veloren-network; veloren-common = _: { # Disable `git-lfs` check here since we check it ourselves # We have to include the command output here, otherwise Nix won't run it @@ -103,8 +100,8 @@ let name = "veloren-voxygen"; inherit version; VELOREN_USERDATA_STRATEGY = "system"; - inherit (crateDeps.veloren-voxygen) buildInputs; - nativeBuildInputs = crateDeps.veloren-voxygen.nativeBuildInputs + inherit (veloren-voxygen) buildInputs; + nativeBuildInputs = veloren-voxygen.nativeBuildInputs ++ [ makeWrapper copyDesktopItems ]; desktopItems = [ velorenVoxygenDesktopFile ]; postInstall = '' @@ -121,6 +118,11 @@ let ''; }; }; + } // { + xcb = _: xcb; + libudev-sys = _: libudev-sys; + alsa-sys = _: alsa-sys; + veloren-network = _: veloren-network; }; inherit release pkgs; };