aboutsummaryrefslogtreecommitdiff
path: root/gn
diff options
context:
space:
mode:
authorEfraim Flashner2023-11-08 10:11:57 +0200
committerEfraim Flashner2023-11-08 10:14:12 +0200
commitfea0ff23da6c9e5db6540eb87d1ade4833d797c2 (patch)
tree95e5b97ef306997045052fe0fec5c4743ee97c5b /gn
parent61f9525a81e4635162b1102a6fd8ef1ed7684055 (diff)
downloadguix-bioinformatics-fea0ff23da6c9e5db6540eb87d1ade4833d797c2.tar.gz
gn: lizardfs: Fix building.
* gn/packages/file-systems.scm (lizardfs)[source]: Add patch. [arguments]: Remove trailing #t from phases. [inputs]: Remove labels. Use fuse-2. * lizardfs-issues-found-on-Fedora-34-using-GCC-11.patch: New file.
Diffstat (limited to 'gn')
-rw-r--r--gn/packages/file-systems.scm27
1 files changed, 12 insertions, 15 deletions
diff --git a/gn/packages/file-systems.scm b/gn/packages/file-systems.scm
index 709754a..bf92ed9 100644
--- a/gn/packages/file-systems.scm
+++ b/gn/packages/file-systems.scm
@@ -28,7 +28,8 @@
(file-name (git-file-name name version))
(sha256
(base32
- "0zk73wmx82ari3m2mv0zx04x1ggsdmwcwn7k6bkl5c0jnxffc4ax"))))
+ "0zk73wmx82ari3m2mv0zx04x1ggsdmwcwn7k6bkl5c0jnxffc4ax"))
+ (patches (search-patches "lizardfs-issues-found-on-Fedora-34-using-GCC-11.patch"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@@ -58,8 +59,7 @@
(("etc/mfs") "/etc/lizardfs"))
;; Then adjust the install instructions.
(substitute* "src/data/CMakeLists.txt"
- (("^install.*") ""))
- #t))
+ (("^install.*") ""))))
(add-after 'unpack 'use-system-libraries
(lambda* (#:key inputs #:allow-other-keys)
(let ((gtest (assoc-ref inputs "googletest"))
@@ -99,9 +99,7 @@
;; fix FTBFS with glibc-2.28; for makedev
;; https://github.com/lizardfs/lizardfs/issues/655
(substitute* "src/chunkserver/iostat.h"
- (("sys/stat.h>") "sys/stat.h>\n#include <sys/sysmacros.h>"))
-
- #t)))
+ (("sys/stat.h>") "sys/stat.h>\n#include <sys/sysmacros.h>")))))
(add-after 'install 'install-extras
;; This got broken by changing the directories above.
(lambda* (#:key outputs #:allow-other-keys)
@@ -120,16 +118,15 @@
(lambda (file)
(copy-file file
(string-append etc "/" (basename file) ".dist")))
- (find-files data "\\.cfg(\\.in)?$"))
- #t)))))))
+ (find-files data "\\.cfg(\\.in)?$")))))))))
(inputs
- `(("bdb" ,bdb)
- ("boost" ,boost)
- ("fuse" ,fuse)
- ("linux-pam" ,linux-pam)
- ("python" ,python-2)
- ("spdlog" ,spdlog)
- ("zlib" ,zlib)))
+ (list bdb
+ boost
+ fuse-2
+ linux-pam
+ python-2
+ spdlog
+ zlib))
(native-inputs
`(("asciidoc" ,asciidoc)
("googletest" ,(package-source googletest-1.7))