02/02: gnu: nix: Look for configuration in /etc.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit b6329d026b6b5ac58cfcfeb26e786aacf70bd636
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Jun 16 13:17:40 2020 +0200

    gnu: nix: Look for configuration in /etc.
    
    Fixes <http://issues.guix.gnu.org/41704>.
    
    * gnu/packages/package-management.scm (nix)[arguments]: Add
    ‘--sysconfdir=/etc’ configure flag and override it during installation.
    
    Requested-and-tested-by: Peng Mei Yu <pengmeiyu@riseup.net>
---
 gnu/packages/package-management.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index c1e6657..4b1c5a6 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -551,6 +551,21 @@ out) and returning a package that uses that as its 
'source'."
               (base32
                "1hbqsrp1ii2sfq8x2mahjrl2182qck76n8blrl1jfz3xq99m6i15"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "--sysconfdir=/etc")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           ;; Don't try & fail to create subdirectories in /etc, but keep them
+           ;; in the output as examples.
+           (lambda* (#:key (make-flags '()) outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (etc (string-append out "/etc")))
+               (apply invoke "make" "install"
+                      (string-append "sysconfdir=" etc)
+                      (string-append "profiledir=" etc "/profile.d")
+                      make-flags)))))))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("boost" ,boost)
               ("brotli" ,brotli)