guix-commits
[Top][All Lists]
Advanced

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

04/04: system: Refer to native packages when appropriate.


From: Ludovic Courtès
Subject: 04/04: system: Refer to native packages when appropriate.
Date: Tue, 11 Jul 2017 17:59:58 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 4ddb64f57d0e9133f8083ee5c6398fa829ed0eab
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jul 11 22:47:08 2017 +0200

    system: Refer to native packages when appropriate.
    
    * gnu/system/locale.scm (localedef-command): Use the native LIBC.
    * gnu/system/shadow.scm (default-skeletons): Use the native GUILE-WM.
---
 gnu/system/locale.scm | 4 ++--
 gnu/system/shadow.scm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm
index 3bb9f95..5148287 100644
--- a/gnu/system/locale.scm
+++ b/gnu/system/locale.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -97,7 +97,7 @@ or #f on failure."
   #~(begin
       (format #t "building locale '~a'...~%"
               #$(locale-definition-name locale))
-      (zero? (system* (string-append #$libc "/bin/localedef")
+      (zero? (system* (string-append #+libc "/bin/localedef")
                       "--no-archive" "--prefix" #$output
                       "-i" #$(locale-definition-source locale)
                       "-f" #$(locale-definition-charset locale)
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index b30ef8e..712e6df 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2016 Alex Griffin <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -143,7 +143,7 @@
     (with-imported-modules '((guix build utils))
       #~(begin
           (use-modules (guix build utils))
-          (copy-file (car (find-files #$guile-wm "wm-init-sample.scm"))
+          (copy-file (car (find-files #+guile-wm "wm-init-sample.scm"))
                      #$output))))
 
   (let ((profile (plain-file "bash_profile" "\



reply via email to

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