nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2017-07-11 22:47:08 +02:00
parent ce6223e68e
commit 4ddb64f57d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/system/locale.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -97,7 +97,7 @@ or #f on failure."
#~(begin #~(begin
(format #t "building locale '~a'...~%" (format #t "building locale '~a'...~%"
#$(locale-definition-name locale)) #$(locale-definition-name locale))
(zero? (system* (string-append #$libc "/bin/localedef") (zero? (system* (string-append #+libc "/bin/localedef")
"--no-archive" "--prefix" #$output "--no-archive" "--prefix" #$output
"-i" #$(locale-definition-source locale) "-i" #$(locale-definition-source locale)
"-f" #$(locale-definition-charset locale) "-f" #$(locale-definition-charset locale)

4
gnu/system/shadow.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -143,7 +143,7 @@
(with-imported-modules '((guix build utils)) (with-imported-modules '((guix build utils))
#~(begin #~(begin
(use-modules (guix build utils)) (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)))) #$output))))
(let ((profile (plain-file "bash_profile" "\ (let ((profile (plain-file "bash_profile" "\