diff options
| author | Ashish SHUKLA <ashish.is@lostca.se> | 2025-03-23 01:20:36 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-04-01 14:49:35 +0200 |
| commit | 9810c4c81876c1d0b193a3605af4117c06cd7391 (patch) | |
| tree | 014491422f14a60c88a5f2a738e1410c2c216af9 /gnu/packages/virtualization.scm | |
| parent | 538f41d09e08031e866e8cc7a22bad2ecbe2f281 (diff) | |
gnu: criu: Update to 4.0.
* gnu/packages/virtualization.scm (criu): Update to 4.0.
[#:phases]<hardcode-variables>: Add a few more substitutions.
<wrap>: Manually install python components. [native-inputs]:
Depend on python-setuptools.
Change-Id: I9fc3a8e554499edd339a89597d0e1438997a24c8
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9c72e1793f3..b5c0c464ac5 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2000,7 +2000,7 @@ client desktops. (define-public criu (package (name "criu") - (version "3.17.1") + (version "4.0") (source (origin (method git-fetch) @@ -2009,7 +2009,7 @@ client desktops. (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ff3xfcf0wfz02fc0qbj56mci1a0xdl8jzaihaw6qyjvgrsiq7fh")))) + (base32 "0p46z5iclyvvg1arvqhl3bdg1g2mny0pxyz6pr5n87cnj7maqphg")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -2040,7 +2040,14 @@ client desktops. (lambda* (#:key inputs outputs #:allow-other-keys) ;; Hardcode arm version detection (substitute* "Makefile" - (("ARMV.*:=.*") "ARMV := 7\n")) + (("ARMV.*:=.*") "ARMV := 7\n") + (("^head-name :=.*") + (string-append "head-name := " + ,(package-version this-package) + "\n"))) + ;; disable pip install + (substitute* "Makefile.install" + (("SKIP_PIP_INSTALL.*:=.*") "SKIP_PIP_INSTALL := 1\n")) ;; Hard-code the correct PLUGINDIR above. (substitute* "criu/include/plugin.h" (("/var") (string-append (assoc-ref outputs "out")))))) @@ -2066,6 +2073,16 @@ client desktops. (package-version python)) "/site-packages")) (path (getenv "GUIX_PYTHONPATH"))) + ;; manually install stuff that was pip-installed + (for-each (lambda (dir) + (with-directory-excursion dir + (setenv "GUIX_PYTHONPATH" + (string-append site ":" path)) + (invoke "python3" "setup.py" "install" + (string-append "--prefix=" out) + "--no-compile" "--root=/" + "--single-version-externally-managed"))) + (list "lib" "crit")) (wrap-program (string-append out "/bin/crit") `("GUIX_PYTHONPATH" ":" prefix (,site ,path)))))) (add-after 'install 'delete-static-libraries @@ -2091,6 +2108,7 @@ client desktops. xmlto docbook-xml docbook-xsl + python-setuptools python-toolchain)) (propagated-inputs ;; included by 'rpc.pb-c.h' |