mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 11:29:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: criu: Remove temporary workaround.

Browse source 
* gnu/packages/virtualization.scm (criu)[arguments]: Import
ensure-no-mtimes-pre-1980 from python-build-system and remove copied code.

Change-Id: I2ab9eb51dfa66fcf5b0144eab73d63055400e30c
This commit is contained in:
Lars-Dominik Braun 2023-05-13 15:31:22 +02:00 • committed by Sharlatan Hellseher
parent 275123dbd9
commit d4e7ce92e3
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/virtualization.scm
View file

@ -1995,8 +1995,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 %default-gnu-imported-modules
%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
@ -2008,17 +2012,8 @@ client desktops.
;; 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.
(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