From 761a0b68241083ae53b9c6dd5db156f69436fc89 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:06:15 -0400 Subject: [PATCH] veloren: fixed to support darwin --- pkgs/by-name/ve/veloren/package.nix | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix index b58ab75a7281..583f64769cd7 100644 --- a/pkgs/by-name/ve/veloren/package.nix +++ b/pkgs/by-name/ve/veloren/package.nix @@ -3,10 +3,12 @@ rustPlatform, fetchFromGitLab, pkg-config, + stdenv, + + # Linux-only vulkan-loader, alsa-lib, udev, - shaderc, libxcb, libxkbcommon, autoPatchelfHook, @@ -15,7 +17,12 @@ libxcursor, libxrandr, wayland, - stdenv, + + # Both platforms + shaderc, + + # macOS-only + desktopToDarwinBundle, }: let @@ -58,16 +65,23 @@ rustPlatform.buildRustPackage { ''; nativeBuildInputs = [ - autoPatchelfHook pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle ]; buildInputs = [ + shaderc + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev libxcb libxkbcommon - shaderc stdenv.cc.cc # libgcc_s.so.1 ]; @@ -92,7 +106,7 @@ rustPlatform.buildRustPackage { # Some tests require internet access doCheck = false; - appendRunpaths = [ + appendRunpaths = lib.optionals stdenv.hostPlatform.isLinux [ (lib.makeLibraryPath ( [ libx11 @@ -122,7 +136,7 @@ rustPlatform.buildRustPackage { homepage = "https://www.veloren.net"; license = lib.licenses.gpl3Only; mainProgram = "veloren-voxygen"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ rnhmjoj tomodachi94