summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorOleg Pykhalov <go.wigust@gmail.com>2020-01-09 02:59:51 +0300
committerOleg Pykhalov <go.wigust@gmail.com>2020-01-09 02:59:51 +0300
commitc1eab4a2a9043004f2cad8f628d3a990c818c7ec (patch)
treedb7bf4984916119c43840646358f913be2851f05 /gnu
parent2266eecfae673cfa333ec1b22ffd1c9789cb71d4 (diff)
downloadguix-c1eab4a2a9043004f2cad8f628d3a990c818c7ec.tar.gz
gnu: s6-linux-init: Update to 1.0.3.1.
* gnu/packages/skarnet.scm (s6-linux-init)[version]: Update to 1.0.3.1.
[inputs]: Add execline and s6.
[arguments]: Add '--with-lib=' for execline and s6.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/skarnet.scm14
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm
index 79d3acb0b6..c26058afe7 100644
--- a/gnu/packages/skarnet.scm
+++ b/gnu/packages/skarnet.scm
@@ -287,7 +287,7 @@ systems and other constrained environments, but they work everywhere.")))
 (define-public s6-linux-init
   (package
    (name "s6-linux-init")
-   (version "0.4.0.1")
+   (version "1.0.3.1")
    (source
     (origin
      (method url-fetch)
@@ -295,16 +295,24 @@ systems and other constrained environments, but they work everywhere.")))
            "http://skarnet.org/software/s6-linux-init/s6-linux-init-"
            version ".tar.gz"))
      (sha256
-      (base32 "0i79b0r3amhsf1xqr9k9v9bxmm4imlakfpsybviwhlj8dlawldxm"))))
+      (base32 "1yq2xnp41a1lqpjzvq5jawgy64jwaxalvjdnlvgdpi9bkicgasi1"))))
     (build-system gnu-build-system)
     (inputs
-     `(("skalibs" ,skalibs)))
+     `(("execline" ,execline)
+       ("s6", s6)
+       ("skalibs" ,skalibs)))
     (arguments
      '(#:configure-flags
        (list
         (string-append "--with-lib="
                        (assoc-ref %build-inputs "skalibs")
                        "/lib/skalibs")
+        (string-append "--with-lib="
+                       (assoc-ref %build-inputs "execline")
+                       "/lib/execline")
+        (string-append "--with-lib="
+                       (assoc-ref %build-inputs "s6")
+                       "/lib/s6")
         (string-append "--with-sysdeps="
                        (assoc-ref %build-inputs "skalibs")
                        "/lib/skalibs/sysdeps"))