From 5ea5c21d18409fda4d307f2272255fbfbc577343 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 6 Aug 2025 07:48:04 +0200 Subject: [PATCH] veloren: fixup - Fix broken install command (metainfo and pixmaps being files) See https://github.com/NixOS/nixpkgs/issues/431034#issuecomment-3153830470 - Remove leftover env variable from testing (cherry picked from commit fc401b784b19a0bb5c29b3ac231139dff467c8b0) --- pkgs/by-name/ve/veloren/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix index b0e59713be0b..cd68a5dc95cc 100644 --- a/pkgs/by-name/ve/veloren/package.nix +++ b/pkgs/by-name/ve/veloren/package.nix @@ -61,7 +61,6 @@ rustPlatform.buildRustPackage { env = { # Enable unstable features, see https://gitlab.com/veloren/veloren/-/issues/264 RUSTC_BOOTSTRAP = true; - RUSTC_BREAK_ON_ICE = true; # Set version info, required by veloren-common NIX_GIT_TAG = "v${version}"; @@ -94,8 +93,8 @@ rustPlatform.buildRustPackage { postInstall = '' # Icons install -Dm644 assets/voxygen/net.veloren.veloren.desktop -t "$out/share/applications" - install -Dm644 assets/voxygen/net.veloren.veloren.png "$out/share/pixmaps" - install -Dm644 assets/voxygen/net.veloren.veloren.metainfo.xml "$out/share/metainfo" + install -Dm644 assets/voxygen/net.veloren.veloren.png -t "$out/share/pixmaps" + 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/" '';