diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2026-01-28 08:24:46 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-02-07 12:28:48 +0100 |
| commit | a3759b6d5ff2313c86971c1705fb903bfb6e0589 (patch) | |
| tree | 690771309a878f9ef8ac2168ff6f0bc6b6450cd6 /gnu/packages/virtualization.scm | |
| parent | ef1c4a8912c8b5c1f7dd5c17856e94e765a9a512 (diff) | |
gnu: criu: Switch to pyproject.
* gnu/packages/virtualization.scm (criu):
[arguments]<#:modules, imported-modules>: Switch to
pyproject-build-system.
<#:phases>: Use site-packages.
Change-Id: I8b80842ad87f8e6367cc0caaefc47fcec0fa2181
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1152a38cf40..c967ef0f8cd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm | |||
| @@ -2120,10 +2120,9 @@ client desktops. | |||
| 2120 | "/bin/xmlto"))) | 2120 | "/bin/xmlto"))) |
| 2121 | #:modules ((guix build gnu-build-system) | 2121 | #:modules ((guix build gnu-build-system) |
| 2122 | (guix build utils) | 2122 | (guix build utils) |
| 2123 | ((guix build python-build-system) | 2123 | ((guix build pyproject-build-system) #:prefix py:)) |
| 2124 | #:select (ensure-no-mtimes-pre-1980))) | ||
| 2125 | #:imported-modules ,(append %default-gnu-imported-modules | 2124 | #:imported-modules ,(append %default-gnu-imported-modules |
| 2126 | %python-build-system-modules) | 2125 | %pyproject-build-system-modules) |
| 2127 | #:phases | 2126 | #:phases |
| 2128 | (modify-phases %standard-phases | 2127 | (modify-phases %standard-phases |
| 2129 | (delete 'configure) ; no configure script | 2128 | (delete 'configure) ; no configure script |
| @@ -2143,7 +2142,7 @@ client desktops. | |||
| 2143 | (substitute* "criu/include/plugin.h" | 2142 | (substitute* "criu/include/plugin.h" |
| 2144 | (("/var") (string-append (assoc-ref outputs "out")))))) | 2143 | (("/var") (string-append (assoc-ref outputs "out")))))) |
| 2145 | (add-after 'unpack 'ensure-no-mtimes-pre-1980 | 2144 | (add-after 'unpack 'ensure-no-mtimes-pre-1980 |
| 2146 | ensure-no-mtimes-pre-1980) | 2145 | py:ensure-no-mtimes-pre-1980) |
| 2147 | (add-before 'build 'fix-symlink | 2146 | (add-before 'build 'fix-symlink |
| 2148 | (lambda* (#:key inputs #:allow-other-keys) | 2147 | (lambda* (#:key inputs #:allow-other-keys) |
| 2149 | ;; The file 'images/google/protobuf/descriptor.proto' points to | 2148 | ;; The file 'images/google/protobuf/descriptor.proto' points to |
| @@ -2159,10 +2158,7 @@ client desktops. | |||
| 2159 | (lambda* (#:key inputs outputs #:allow-other-keys) | 2158 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| 2160 | ;; Make sure 'crit' runs with the correct PYTHONPATH. | 2159 | ;; Make sure 'crit' runs with the correct PYTHONPATH. |
| 2161 | (let* ((out (assoc-ref outputs "out")) | 2160 | (let* ((out (assoc-ref outputs "out")) |
| 2162 | (site (string-append out "/lib/python" | 2161 | (site (py:site-packages inputs outputs)) |
| 2163 | ,(version-major+minor | ||
| 2164 | (package-version python)) | ||
| 2165 | "/site-packages")) | ||
| 2166 | (path (getenv "GUIX_PYTHONPATH"))) | 2162 | (path (getenv "GUIX_PYTHONPATH"))) |
| 2167 | ;; manually install stuff that was pip-installed | 2163 | ;; manually install stuff that was pip-installed |
| 2168 | (for-each (lambda (dir) | 2164 | (for-each (lambda (dir) |
