From 55e5cc89e5fc59e20757a6f4f5caefe0048a1214 Mon Sep 17 00:00:00 2001 From: Philipp Joram Date: Wed, 8 Jan 2025 14:34:04 +0200 Subject: [PATCH] gittyup: Prefer using `cmakeBool` --- .../version-management/gittyup/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/applications/version-management/gittyup/default.nix index aab9b79c0417..8794e5013b28 100644 --- a/pkgs/applications/version-management/gittyup/default.nix +++ b/pkgs/applications/version-management/gittyup/default.nix @@ -29,18 +29,22 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=OFF" - "-DUSE_SYSTEM_CMARK=ON" - "-DUSE_SYSTEM_GIT=ON" - "-DUSE_SYSTEM_HUNSPELL=ON" - # upstream uses its own fork of libgit2 as of 1.2.2, however this may change in the future - # "-DUSE_SYSTEM_LIBGIT2=ON" - "-DUSE_SYSTEM_LIBSSH2=ON" - "-DUSE_SYSTEM_LUA=ON" - "-DUSE_SYSTEM_OPENSSL=ON" - "-DENABLE_UPDATE_OVER_GUI=OFF" - ]; + cmakeFlags = + let + inherit (lib) cmakeBool; + in + [ + (cmakeBool "BUILD_SHARED_LIBS" false) + (cmakeBool "USE_SYSTEM_CMARK" true) + (cmakeBool "USE_SYSTEM_GIT" true) + (cmakeBool "USE_SYSTEM_HUNSPELL" true) + # upstream uses its own fork of libgit2 as of 1.2.2, however this may change in the future + # (cmakeBool "USE_SYSTEM_LIBGIT2" true) + (cmakeBool "USE_SYSTEM_LIBSSH2" true) + (cmakeBool "USE_SYSTEM_LUA" true) + (cmakeBool "USE_SYSTEM_OPENSSL" true) + (cmakeBool "ENABLE_UPDATE_OVER_GUI" false) + ]; nativeBuildInputs = [ cmake