From a9962768fe0b12024a41876df8ef51db867caff7 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Fri, 8 May 2026 02:57:32 +0200 Subject: [PATCH] minizip-ng: fixup cmake options and make use of lib.cmakeBool --- pkgs/by-name/mi/minizip-ng/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index e58665f269d3..ceee5ea293a7 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config ]; + buildInputs = [ zlib bzip2 @@ -36,19 +37,16 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DMZ_OPENSSL=ON" - "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" - "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" - "-DMZ_LIB_SUFFIX='-ng'" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "MZ_OPENSSL" true) + (lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers + (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeFeature "MZ_LIB_SUFFIX" "-ng") ] ++ lib.optionals stdenv.hostPlatform.isi686 [ # tests fail - "-DMZ_PKCRYPT=OFF" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # missing header file - "-DMZ_LIBCOMP=OFF" + (lib.cmakeBool "MZ_PKCRYPT" false) ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-register";