From d09831c40ad3ba659c22c8604ba595670a546e63 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Tue, 15 Dec 2020 17:42:44 +0200
Subject: octopus: Add lizardfs service

---
 gn/packages/file-systems.scm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'gn/packages')

diff --git a/gn/packages/file-systems.scm b/gn/packages/file-systems.scm
index 0e874c2..f5fb2fb 100644
--- a/gn/packages/file-systems.scm
+++ b/gn/packages/file-systems.scm
@@ -36,17 +36,27 @@
              "-DENABLE_STATIC=NO"
              "-DENABLE_VERBOSE_ASCIIDOC=YES"
              "-DENABLE_TCMALLOC=NO"
+             ;"-DLIB_SUBDIR=lib" ; no 64 suffix
              ;; Some directories need to be changed
-             "-DRUN_SUBDIR=/var/run/lizardfs"
-             "-DDATA_SUBDIR=/var/lib/lizardfs"
+             ;"-DRUN_SUBDIR=/var/run/lizardfs"
+             ;"-DDATA_SUBDIR=/var/lib/lizardfs"
+             ;"-DETC_SUBDIR=/etc/lizardfs"
              "-DENABLE_UTILS=YES")
        #:tests? #f  ; Tests fail to build.
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'dont-use-lib64
+         (add-after 'unpack 'configure-through-cmakelists.txt
            (lambda _
+             ;; For some reason some configure flags don't work.
              (substitute* "CMakeLists.txt"
-               (("\"64\"") "\"\""))
+               (("\"64\"") "\"\"")
+               (("var/run/mfs") "/var/run/lizardfs")
+               (("var/lib/mfs") "/var/lib/lizardfs")
+               (("etc/mfs") "/etc/lizardfs"))
+             ;; Then adjust the install directories back.
+             (substitute* "src/data/CMakeLists.txt"
+               (("\\$\\{ETC_SUBDIR\\}") "etc/lizardfs")
+               (("\\$\\{DATA_SUBDIR\\}") "var/lib/lizardfs"))
              #t))
          (add-after 'unpack 'use-system-libraries
            (lambda* (#:key inputs #:allow-other-keys)
-- 
cgit v1.2.3