From 62b227cea0f3f672e07439b877a6a43d0688de8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Mon, 18 May 2026 19:07:02 -0400 Subject: [PATCH] veloren: formatting and cleanup and cleanup --- pkgs/by-name/ve/veloren/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix index 0dbd30ab7659..43b515447dd7 100644 --- a/pkgs/by-name/ve/veloren/package.nix +++ b/pkgs/by-name/ve/veloren/package.nix @@ -32,7 +32,6 @@ let timestamp = "1769191511"; rev = "1d12f35edd6cdbfc1fb921c167cdd7beeeffe248"; in - rustPlatform.buildRustPackage { pname = "veloren"; inherit version; @@ -52,14 +51,16 @@ rustPlatform.buildRustPackage { postPatch = '' # Force vek to build in unstable mode - cat <<'EOF' | tee "$cargoDepsCopy"/*/vek-*/build.rs + tee "$cargoDepsCopy"/*/vek-*/build.rs > /dev/null <<'EOF' fn main() { println!("cargo:rustc-check-cfg=cfg(nightly)"); println!("cargo:rustc-cfg=nightly"); } EOF + # Fix assets path substituteAllInPlace common/assets/src/lib.rs + # Do not use mold, it produces broken binaries substituteInPlace .cargo/config.toml --replace-fail mold gold ''; @@ -127,6 +128,7 @@ rustPlatform.buildRustPackage { install -Dm644 assets/voxygen/net.veloren.veloren.desktop -t "$out/share/applications" install -Dm644 assets/voxygen/net.veloren.veloren.png -t "$out/share/icons/hicolor/256x256/apps" install -Dm644 assets/voxygen/net.veloren.veloren.metainfo.xml -t "$out/share/metainfo" + # Assets directory mkdir -p "$out/share/veloren"; cp -ar assets "$out/share/veloren/" '';