From 714b21048b70c74d53bd0cd84771dec21b0b68bb Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Wed, 13 Aug 2025 17:41:46 +0100 Subject: [PATCH] shipwright: nixfmt-rfc-style --- pkgs/by-name/sh/shipwright/package.nix | 103 ++++++++++++------------- 1 file changed, 50 insertions(+), 53 deletions(-) diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index 520787bd43f0..c3fd3e73c0c8 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -133,61 +133,58 @@ stdenv.mkDerivation (finalAttrs: { ./disable-downloading-stb_image.patch ]; - nativeBuildInputs = - [ - cmake - ninja - pkg-config - python3 - imagemagick - makeWrapper - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - lsb-release - copyDesktopItems - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libicns - darwin.sigtool - fixDarwinDylibNames - ]; + nativeBuildInputs = [ + cmake + ninja + pkg-config + python3 + imagemagick + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + lsb-release + copyDesktopItems + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libicns + darwin.sigtool + fixDarwinDylibNames + ]; - buildInputs = - [ - boost - glew - SDL2 - SDL2_net - libpng - libzip - nlohmann_json - tinyxml-2 - spdlog - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libpulseaudio - zenity - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Metal.hpp requires macOS 13.x min. - apple-sdk_13 - ]; + buildInputs = [ + boost + glew + SDL2 + SDL2_net + libpng + libzip + nlohmann_json + tinyxml-2 + spdlog + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libpulseaudio + zenity + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Metal.hpp requires macOS 13.x min. + apple-sdk_13 + ]; - cmakeFlags = - [ - (lib.cmakeBool "BUILD_REMOTE_CONTROL" true) - (lib.cmakeBool "NON_PORTABLE" true) - (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}") - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPDLOG" "${spdlog}") - ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_REMOTE_CONTROL" true) + (lib.cmakeBool "NON_PORTABLE" true) + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPDLOG" "${spdlog}") + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int -Wno-elaborated-enum-base";