diff mbox series

[bug#75119,v3,5/5] gnu: criu: Update to 4.0.

Message ID 4393837905c168e910b4865ab9dbc982974f8a48.1742692836.git.ashish.is@lostca.se
State New
Headers
Series [bug#75119,v3,1/5] gnu: e2fsprogs: Update to 1.47.1. |

Commit Message

vasilii.smirnov--- via Guix-patches" via March 23, 2025, 1:20 a.m. UTC 
  From: Ashish SHUKLA <ashish.is@lostca.se>

* 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
---
 gnu/packages/virtualization.scm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 9c72e1793f..b5c0c464ac 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2000,7 +2000,7 @@  (define-public vmware-open-vm-tools-gtk
 (define-public criu
   (package
     (name "criu")
-    (version "3.17.1")
+    (version "4.0")
     (source
      (origin
        (method git-fetch)
@@ -2009,7 +2009,7 @@  (define-public criu
              (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 @@  (define-public criu
            (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 @@  (define-public criu
                                            (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 @@  (define-public criu
            xmlto
            docbook-xml
            docbook-xsl
+           python-setuptools
            python-toolchain))
     (propagated-inputs
      ;; included by 'rpc.pb-c.h'