diff options
| author | Lars-Dominik Braun <lars@6xq.net> | 2023-05-13 15:31:22 +0200 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-10-11 21:14:45 +0100 |
| commit | 57e9776eee4b748144962633f0a9dd3731d94b94 (patch) | |
| tree | 4d759968169a6fea4336ab9d3d46e7c533655d92 | |
| parent | 1e08199bf011d5037ad22ae8379be8e0813b09a2 (diff) | |
gnu: criu: Remove temporary workaround.
* gnu/packages/virtualization.scm (criu)[arguments]: Import
ensure-no-mtimes-pre-1980 from python-build-system and remove copied code.
Change-Id: I2ab9eb51dfa66fcf5b0144eab73d63055400e30c
| -rw-r--r-- | gnu/packages/virtualization.scm | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index bfca5885c6..215e84b676 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1988,8 +1988,12 @@ client desktops. (string-append "XMLTO=" (search-input-file %build-inputs "/bin/xmlto"))) - #:modules ((ice-9 ftw) - ,@%default-gnu-modules) + #:modules ((guix build gnu-build-system) + (guix build utils) + ((guix build python-build-system) + #:select (ensure-no-mtimes-pre-1980))) + #:imported-modules ,(append %gnu-build-system-modules + %python-build-system-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -2000,18 +2004,10 @@ client desktops. (("ARMV.*:=.*") "ARMV := 7\n")) ;; Hard-code the correct PLUGINDIR above. (substitute* "criu/include/plugin.h" - (("/var") (string-append (assoc-ref outputs "out")))))) - ;; TODO: use - ;; (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980) - ;; when it no longer throws due to trying to call UTIME on symlinks. + (("/var") (string-append (assoc-ref outputs "out")))) + )) (add-after 'unpack 'ensure-no-mtimes-pre-1980 - (lambda _ - (let ((early-1980 315619200)) ; 1980-01-02 UTC - (ftw "." (lambda (file stat flag) - (unless (or (<= early-1980 (stat:mtime stat)) - (eq? (stat:type stat) 'symlink)) - (utime file early-1980 early-1980)) - #t))))) + ensure-no-mtimes-pre-1980) (add-before 'build 'fix-symlink (lambda* (#:key inputs #:allow-other-keys) ;; The file 'images/google/protobuf/descriptor.proto' points to |