mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
nix: add missing dependency xcb
This commit is contained in:
parent
b75a5ab32c
commit
23d1abc8a6
@ -28,6 +28,7 @@ with pkgs;
|
|||||||
alsa-sys = makeDeps [ alsaLib ] [ pkg-config ];
|
alsa-sys = makeDeps [ alsaLib ] [ pkg-config ];
|
||||||
veloren-network = makeDeps [ openssl ] [ pkg-config ];
|
veloren-network = makeDeps [ openssl ] [ pkg-config ];
|
||||||
veloren-voxygen = makeDeps [ xorg.libxcb ] [ ];
|
veloren-voxygen = makeDeps [ xorg.libxcb ] [ ];
|
||||||
|
xcb = makeDeps [ ] [ python3 ];
|
||||||
};
|
};
|
||||||
# deps that voxygen needs to function
|
# deps that voxygen needs to function
|
||||||
# FIXME: Wayland doesn't work (adding libxkbcommon, wayland and wayland-protocols results in a panic)
|
# FIXME: Wayland doesn't work (adding libxkbcommon, wayland and wayland-protocols results in a panic)
|
||||||
|
@ -71,11 +71,8 @@ let
|
|||||||
|
|
||||||
veloren-crates = with pkgs;
|
veloren-crates = with pkgs;
|
||||||
callPackage ./Cargo.nix {
|
callPackage ./Cargo.nix {
|
||||||
defaultCrateOverrides = with common;
|
defaultCrateOverrides = with common; with crateDeps;
|
||||||
defaultCrateOverrides // {
|
defaultCrateOverrides // {
|
||||||
libudev-sys = _: crateDeps.libudev-sys;
|
|
||||||
alsa-sys = _: crateDeps.alsa-sys;
|
|
||||||
veloren-network = _: crateDeps.veloren-network;
|
|
||||||
veloren-common = _: {
|
veloren-common = _: {
|
||||||
# Disable `git-lfs` check here since we check it ourselves
|
# Disable `git-lfs` check here since we check it ourselves
|
||||||
# We have to include the command output here, otherwise Nix won't run it
|
# We have to include the command output here, otherwise Nix won't run it
|
||||||
@ -103,8 +100,8 @@ let
|
|||||||
name = "veloren-voxygen";
|
name = "veloren-voxygen";
|
||||||
inherit version;
|
inherit version;
|
||||||
VELOREN_USERDATA_STRATEGY = "system";
|
VELOREN_USERDATA_STRATEGY = "system";
|
||||||
inherit (crateDeps.veloren-voxygen) buildInputs;
|
inherit (veloren-voxygen) buildInputs;
|
||||||
nativeBuildInputs = crateDeps.veloren-voxygen.nativeBuildInputs
|
nativeBuildInputs = veloren-voxygen.nativeBuildInputs
|
||||||
++ [ makeWrapper copyDesktopItems ];
|
++ [ makeWrapper copyDesktopItems ];
|
||||||
desktopItems = [ velorenVoxygenDesktopFile ];
|
desktopItems = [ velorenVoxygenDesktopFile ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
@ -121,6 +118,11 @@ let
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
} // {
|
||||||
|
xcb = _: xcb;
|
||||||
|
libudev-sys = _: libudev-sys;
|
||||||
|
alsa-sys = _: alsa-sys;
|
||||||
|
veloren-network = _: veloren-network;
|
||||||
};
|
};
|
||||||
inherit release pkgs;
|
inherit release pkgs;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user