guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: tlp: Fix build.


From: Nicolas Goaziou
Subject: 01/01: gnu: tlp: Fix build.
Date: Sat, 10 Feb 2018 06:49:49 -0500 (EST)

ngz pushed a commit to branch master
in repository guix.

commit 6db6c3a98fb42c7eeeca6da6193134b6640e1c65
Author: Nicolas Goaziou <address@hidden>
Date:   Sat Feb 10 12:47:59 2018 +0100

    gnu: tlp: Fix build.
    
    * gnu/packages/linux.scm (tlp): Add "TLP_META" environment variable.  Use
      "invoke".
---
 gnu/packages/linux.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 96dab26..d39654e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2016, 2017 Alex Kost <address@hidden>
 ;;; Copyright © 2016 Raymond Nicholson <address@hidden>
 ;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
-;;; Copyright © 2016 Nicolas Goaziou <address@hidden>
+;;; Copyright © 2016, 2018 Nicolas Goaziou <address@hidden>
 ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016 David Craven <address@hidden>
 ;;; Copyright © 2016 John Darrington <address@hidden>
@@ -4084,7 +4084,8 @@ Light is the successor of lightscript.")
                (setenv "TLP_CONF" "/etc/tlp")
                (setenv "TLP_SHCPL"
                        (string-append out 
"/share/bash-completion/completions"))
-               (setenv "TLP_MAN" (string-append out "/share/man")))))
+               (setenv "TLP_MAN" (string-append out "/share/man"))
+               (setenv "TLP_META" (string-append out "/share/metainfo")))))
          (delete 'check)                ; no tests
          (add-before 'install 'fix-installation
            (lambda _
@@ -4092,7 +4093,8 @@ Light is the successor of lightscript.")
              (substitute* "Makefile" (("\\[ -f \\$\\(_CONF\\) \\]") "#"))))
          (replace 'install
            (lambda _
-             (zero? (system* "make" "install-tlp" "install-man"))))
+             (invoke "make" "install-tlp" "install-man")
+             #t))
          (add-after 'install 'wrap
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((bin (string-append (assoc-ref outputs "out") "/bin"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]