TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: restic: Fix build.

Browse source 
This fixes a regression introduced by commit f42e4ebb56.

* gnu/packages/backup.scm (restic)[arguments]: Remove "unpack-path" argument.
[phases]{build, check, install, install-docs}: Update the working directory to
"src/github.com/restic/restic".
This commit is contained in:
Maxim Cournoyer 2019-05-06 22:36:43 -04:00
parent d879fd80c7
commit fb09818277
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/backup.scm
View file

@ -887,16 +887,13 @@ (define-public restic
(build-system go-build-system)
(arguments
`(#:import-path "github.com/restic/restic"
#:unpack-path "github.com/restic"
;; We don't need to install the source code for end-user applications.
#:install-source? #f
#:phases
(modify-phases %standard-phases
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion (string-append
"src/github.com/restic/restic-"
,version)
(with-directory-excursion "src/github.com/restic/restic"
;; Disable 'restic self-update'. It makes little sense in Guix.
(substitute* "build.go" (("selfupdate") ""))
(setenv "HOME" (getcwd)) ; for $HOME/.cache/go-build
@ -904,9 +901,7 @@ (define-public restic
(replace 'check
(lambda _
(with-directory-excursion (string-append
"src/github.com/restic/restic-"
,version)
(with-directory-excursion "src/github.com/restic/restic"
;; Disable FUSE tests.
(setenv "RESTIC_TEST_FUSE" "0")
(invoke "go" "run" "build.go" "--test"))))
@ -914,8 +909,7 @@ (define-public restic
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(src (string-append "src/github.com/restic/restic-"
,version)))
(src "src/github.com/restic/restic"))
(install-file (string-append src "/restic")
(string-append out "/bin"))
#t)))
@ -925,8 +919,7 @@ (define-public restic
(let* ((out (assoc-ref outputs "out"))
(man "/share/man")
(man-section (string-append man "/man"))
(src (string-append "src/github.com/restic/restic-"
,version "/doc/man/")))
(src "src/github.com/restic/restic/doc/man/"))
;; Install all the man pages to "out".
(for-each
(lambda (file)