diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-07-11 22:47:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-07-11 22:47:08 +0200 |
| commit | 4ddb64f57d0e9133f8083ee5c6398fa829ed0eab (patch) | |
| tree | 8efe54e3fc741155ccf5d762cb77f2f41ba62fdd | |
| parent | ce6223e68e339f6917c636a194df3dfa95991e74 (diff) | |
| download | patches-4ddb64f57d0e9133f8083ee5c6398fa829ed0eab.tar patches-4ddb64f57d0e9133f8083ee5c6398fa829ed0eab.tar.gz | |
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.
| -rw-r--r-- | gnu/system/locale.scm | 4 | ||||
| -rw-r--r-- | 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 3bb9f950a8..51482879f7 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 <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; ;;; 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 b30ef8e390..712e6df8d8 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 <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; ;;; 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" "\ |