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

Merge branch '1773-nix_build_test_failing' into 'master'

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

Closes #1773

See merge request veloren/veloren!3751
This commit is contained in:
Imbris 2023-01-10 19:46:30 +00:00
commit b0587bc944
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_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;