diff options
| author | Maxim Cournoyer <maxim@guixotic.coop> | 2025-07-23 11:20:49 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2025-08-01 11:47:40 +0900 |
| commit | 7f20f528eef19118444aa9c985715efedb92d712 (patch) | |
| tree | a2315095f32c4d9c1c17f563359368ddc05cd47d | |
| parent | 37b1aa7efa6409a5bdf60c7bcb3a1f94d592d357 (diff) | |
gnu: minizip-ng: Do not build in compatibility mode.
The pkg-config naming (and personality) of minizip-ng changes depending on
whether it's built with minizip-compatibility mode (enabled by default). Since
this package is named minizip-ng and not replacing the original minizip (yet),
preserve its own personality. 'minizip-ng.pc' is required by packages such as
emu-dolphin.
* gnu/packages/compression.scm (minizip-ng)
[#:configure-flags]: Add -DMZ_COMPAT=OFF.
(minizip-ng-compat): New variable.
* gnu/packages/emulators.scm (dolphin-emu) [inputs]: Replace minizip-ng with
minizip-ng-compat.
Change-Id: I71227035ef110162f72b9d0128b5c985c9cd58a5
| -rw-r--r-- | gnu/packages/compression.scm | 13 | ||||
| -rw-r--r-- | gnu/packages/emulators.scm | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 27a1902796..442ebe41cd 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net> ;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> -;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021, 2024-2025 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2021 Ahmad Jarara <git@ajarara.io> ;;; Copyright © 2022 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> @@ -876,7 +876,8 @@ with the sfArk algorithm.") (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" "-DMZ_BUILD_TESTS=ON" - "-DMZ_BUILD_UNIT_TESTS=ON"))) + "-DMZ_BUILD_UNIT_TESTS=ON" + "-DMZ_COMPAT=OFF"))) (native-inputs (list googletest pkg-config)) (inputs (list openssl zlib `(,zstd "lib"))) (home-page "https://github.com/zlib-ng/minizip-ng") @@ -885,6 +886,14 @@ with the sfArk algorithm.") C, forked from the zip manipulation library found in the zlib distribution.") (license license:bsd-3))) +(define-public minizip-ng-compat + (package/inherit minizip-ng + (name "minizip-ng-compat") + (arguments + (substitute-keyword-arguments (package-arguments minizip-ng) + ((#:configure-flags flags) + #~(delete "-DMZ_COMPAT=OFF" #$flags)))))) + (define-public sfarkxtc (let ((commit "13cd6f93725a90d91ec5ea75babf1dbd694ac463") (revision "1")) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 66bbcf09c3..dd8eefa081 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -513,7 +513,7 @@ It aims to support Nintendo DSi and 3DS as well.") mbedtls-lts mesa miniupnpc - minizip-ng + minizip-ng-compat openal pugixml pulseaudio |