From e0fbbaf84c6fb13738a91b8db497d852121b8465 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Jul 2023 02:00:07 +0200 Subject: gnu: python-pyzstd: Unbundle and dynamically link Zstd. * gnu/packages/python-compression.scm (python-pyzstd)[source]: Delete bundled Zstd. [arguments]: Add "--dynamic-link-zstd" configure flag, and honour it. [inputs]: Add zstd. --- gnu/packages/python-compression.scm | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 6adb1cd757..000d42524d 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2023 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2019, 2021, 2022 Ricardo Wurmus ;;; Copyright © 2017 Nikita ;;; Copyright © 2017 Julien Lepiller @@ -568,8 +568,32 @@ provided.") (method url-fetch) (uri (pypi-uri "pyzstd" version)) (sha256 - (base32 "1iycfmif15v1jhv0gsza1hyd1hn3sz0vn9s1y79abzv8axndxzfb")))) + (base32 "1iycfmif15v1jhv0gsza1hyd1hn3sz0vn9s1y79abzv8axndxzfb")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove a bundled copy of the zstd sources. + (delete-file-recursively "zstd"))))) (build-system python-build-system) + (arguments + (list + #:configure-flags + #~(list "--dynamic-link-zstd") + #:phases + #~(modify-phases %standard-phases + (replace 'build + ;; The python-build-system's phase doesn't honour configure-flags. + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "python" "./setup.py" "build" + configure-flags))) + (replace 'check + ;; The python-build-system's phase doesn't honour configure-flags. + (lambda* (#:key tests? test-target configure-flags + #:allow-other-keys) + (when tests? + (apply invoke "python" "./setup.py" test-target + configure-flags))))))) + (inputs (list `(,zstd "lib"))) (home-page "https://github.com/animalize/pyzstd") (synopsis "Zstandard bindings for Python") (description "This package provides Python bindings to the Zstandard (zstd) -- cgit 1.4.1