Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue 1773 - nix build: tests are failing with Assets directory not found

Browse Source
This commit is contained in:
Nico 2023-01-07 22:11:32 +01:00
parent 185dccc1cc
commit dcd1a45a22
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -95,6 +95,11 @@
NIX_GIT_HASH = ""; NIX_GIT_HASH = "";
NIX_GIT_TAG = ""; 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 wrapWithAssets = _: old: let
runtimeLibs = with pkgs; [ runtimeLibs = with pkgs; [
xorg.libX11 xorg.libX11
@ -108,11 +113,6 @@
alsa-lib alsa-lib
vulkan-loader vulkan-loader
]; ];
assets = pkgs.runCommand "veloren-assets" {} ''
mkdir $out
ln -sf ${./assets} $out/assets
${checkIfLfsIsSetup pkgs "$out/assets/voxygen/background/bg_main.jpg"}
'';
wrapped = wrapped =
common.internal.pkgsSet.utils.wrapDerivation old common.internal.pkgsSet.utils.wrapDerivation old
{nativeBuildInputs = [pkgs.makeWrapper];} {nativeBuildInputs = [pkgs.makeWrapper];}
@ -143,6 +143,7 @@
ncl.addNativeBuildInputs oldAttrs (with pkgs; [python3 pkg-config]); ncl.addNativeBuildInputs oldAttrs (with pkgs; [python3 pkg-config]);
SHADERC_LIB_DIR = "${pkgs.shaderc.lib}/lib"; SHADERC_LIB_DIR = "${pkgs.shaderc.lib}/lib";
VELOREN_ASSETS = "${assets}";
doCheck = false; doCheck = false;
dontCheck = true; dontCheck = true;