summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2025-07-23 11:20:49 +0900
committerMaxim Cournoyer <maxim@guixotic.coop>2025-08-01 11:47:40 +0900
commit7f20f528eef19118444aa9c985715efedb92d712 (patch)
treea2315095f32c4d9c1c17f563359368ddc05cd47d /gnu/packages
parent37b1aa7efa6409a5bdf60c7bcb3a1f94d592d357 (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
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/compression.scm13
-rw-r--r--gnu/packages/emulators.scm2
2 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 27a19027964..442ebe41cd0 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -33,7 +33,7 @@
33;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net> 33;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
34;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com> 34;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
35;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> 35;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
36;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> 36;;; Copyright © 2021, 2024-2025 Maxim Cournoyer <maxim@guixotic.coop>
37;;; Copyright © 2021 Ahmad Jarara <git@ajarara.io> 37;;; Copyright © 2021 Ahmad Jarara <git@ajarara.io>
38;;; Copyright © 2022 Greg Hogan <code@greghogan.com> 38;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
39;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> 39;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
@@ -876,7 +876,8 @@ with the sfArk algorithm.")
876 (arguments 876 (arguments
877 (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" 877 (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"
878 "-DMZ_BUILD_TESTS=ON" 878 "-DMZ_BUILD_TESTS=ON"
879 "-DMZ_BUILD_UNIT_TESTS=ON"))) 879 "-DMZ_BUILD_UNIT_TESTS=ON"
880 "-DMZ_COMPAT=OFF")))
880 (native-inputs (list googletest pkg-config)) 881 (native-inputs (list googletest pkg-config))
881 (inputs (list openssl zlib `(,zstd "lib"))) 882 (inputs (list openssl zlib `(,zstd "lib")))
882 (home-page "https://github.com/zlib-ng/minizip-ng") 883 (home-page "https://github.com/zlib-ng/minizip-ng")
@@ -885,6 +886,14 @@ with the sfArk algorithm.")
885C, forked from the zip manipulation library found in the zlib distribution.") 886C, forked from the zip manipulation library found in the zlib distribution.")
886 (license license:bsd-3))) 887 (license license:bsd-3)))
887 888
889(define-public minizip-ng-compat
890 (package/inherit minizip-ng
891 (name "minizip-ng-compat")
892 (arguments
893 (substitute-keyword-arguments (package-arguments minizip-ng)
894 ((#:configure-flags flags)
895 #~(delete "-DMZ_COMPAT=OFF" #$flags))))))
896
888(define-public sfarkxtc 897(define-public sfarkxtc
889 (let ((commit "13cd6f93725a90d91ec5ea75babf1dbd694ac463") 898 (let ((commit "13cd6f93725a90d91ec5ea75babf1dbd694ac463")
890 (revision "1")) 899 (revision "1"))
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 66bbcf09c3e..dd8eefa081c 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.")
513 mbedtls-lts 513 mbedtls-lts
514 mesa 514 mesa
515 miniupnpc 515 miniupnpc
516 minizip-ng 516 minizip-ng-compat
517 openal 517 openal
518 pugixml 518 pugixml
519 pulseaudio 519 pulseaudio