From d3a32f77d5029939b709536c4be8ed82f5511d71 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Sun, 31 May 2026 00:22:21 +0200 Subject: [PATCH] minizip-ng{-compat}: split compat --- pkgs/by-name/mi/minizip-ng-compat/package.nix | 6 ++++++ pkgs/by-name/mi/minizip-ng/package.nix | 17 +++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/mi/minizip-ng-compat/package.nix diff --git a/pkgs/by-name/mi/minizip-ng-compat/package.nix b/pkgs/by-name/mi/minizip-ng-compat/package.nix new file mode 100644 index 000000000000..22d06bcc1322 --- /dev/null +++ b/pkgs/by-name/mi/minizip-ng-compat/package.nix @@ -0,0 +1,6 @@ +{ + minizip-ng, +}: +minizip-ng.override { + enableCompat = true; +} diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index cb9dd6fa5943..a92beb320e15 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -10,10 +10,11 @@ xz, zstd, openssl, + enableCompat ? false, }: stdenv.mkDerivation (finalAttrs: { - pname = "minizip-ng"; + pname = "minizip-ng" + lib.optionalString enableCompat "-compat"; version = "4.2.1"; src = fetchFromGitHub { @@ -43,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { (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.cmakeBool "MZ_COMPAT" enableCompat) ] ++ lib.optionals stdenv.hostPlatform.isi686 [ # tests fail @@ -52,18 +53,6 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-register"; - postInstall = '' - # make lib findable as libminizip-ng even if compat is enabled - for ext in so dylib a ; do - if [ -e $out/lib/libminizip.$ext ] && [ ! -e $out/lib/libminizip-ng.$ext ]; then - ln -s $out/lib/libminizip.$ext $out/lib/libminizip-ng.$ext - fi - done - if [ ! -e $out/include/minizip-ng ]; then - ln -s $out/include $out/include/minizip-ng - fi - ''; - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkInputs = [ gtest ]; enableParallelChecking = false;