mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Issue 1773 - nix build: tests are failing with Assets directory not found
This commit is contained in:
parent
185dccc1cc
commit
dcd1a45a22
11
flake.nix
11
flake.nix
@ -95,6 +95,11 @@
|
||||
NIX_GIT_HASH = "";
|
||||
NIX_GIT_TAG = "";
|
||||
};
|
||||
assets = pkgs.runCommand "veloren-assets" {} ''
|
||||
mkdir $out
|
||||
ln -sf ${./assets} $out/assets
|
||||
${checkIfLfsIsSetup pkgs "$out/assets/voxygen/background/bg_main.jpg"}
|
||||
'';
|
||||
wrapWithAssets = _: old: let
|
||||
runtimeLibs = with pkgs; [
|
||||
xorg.libX11
|
||||
@ -108,11 +113,6 @@
|
||||
alsa-lib
|
||||
vulkan-loader
|
||||
];
|
||||
assets = pkgs.runCommand "veloren-assets" {} ''
|
||||
mkdir $out
|
||||
ln -sf ${./assets} $out/assets
|
||||
${checkIfLfsIsSetup pkgs "$out/assets/voxygen/background/bg_main.jpg"}
|
||||
'';
|
||||
wrapped =
|
||||
common.internal.pkgsSet.utils.wrapDerivation old
|
||||
{nativeBuildInputs = [pkgs.makeWrapper];}
|
||||
@ -143,6 +143,7 @@
|
||||
ncl.addNativeBuildInputs oldAttrs (with pkgs; [python3 pkg-config]);
|
||||
|
||||
SHADERC_LIB_DIR = "${pkgs.shaderc.lib}/lib";
|
||||
VELOREN_ASSETS = "${assets}";
|
||||
|
||||
doCheck = false;
|
||||
dontCheck = true;
|
||||
|
Loading…
Reference in New Issue
Block a user