mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-21 01:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: util-linux: Adjust indentation.

Browse source 
* gnu/packages/linux.scm (util-linux): Re-indent.
This commit is contained in:
Marius Bakke 2019-10-13 17:23:28 +02:00
parent 0163b9002a
commit a4a70cc4d7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 36 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
gnu/packages/linux.scm
View file

@ -1090,7 +1090,7 @@ (define-public util-linux
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"static")) ; >2 MiB of static .a libraries "static")) ;>2 MiB of static .a libraries
(arguments (arguments
`(#:configure-flags (list "--disable-use-tty-group" `(#:configure-flags (list "--disable-use-tty-group"
"--enable-fs-paths-default=/run/current-system/profile/sbin" "--enable-fs-paths-default=/run/current-system/profile/sbin"
@ -1102,45 +1102,42 @@ (define-public util-linux
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/etc/bash_completion.d")) "/etc/bash_completion.d"))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before (add-before 'build 'set-umount-file-name
'build 'set-umount-file-name (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) ;; Tell 'eject' the right file name of 'umount'.
;; Tell 'eject' the right file name of 'umount'. (let ((out (assoc-ref outputs "out")))
(let ((out (assoc-ref outputs "out"))) (substitute* "sys-utils/eject.c"
(substitute* "sys-utils/eject.c" (("\"/bin/umount\"")
(("\"/bin/umount\"") (string-append "\"" out "/bin/umount\"")))
(string-append "\"" out "/bin/umount\""))) #t)))
#t))) (add-before 'check 'pre-check
(add-before (lambda* (#:key inputs outputs #:allow-other-keys)
'check 'pre-check (let ((out (assoc-ref outputs "out"))
(lambda* (#:key inputs outputs #:allow-other-keys) (net (assoc-ref inputs "net-base")))
(let ((out (assoc-ref outputs "out")) ;; Change the test to refer to the right file.
(net (assoc-ref inputs "net-base"))) (substitute* "tests/ts/misc/mcookie"
;; Change the test to refer to the right file. (("/etc/services")
(substitute* "tests/ts/misc/mcookie" (string-append net "/etc/services")))
(("/etc/services") #t)))
(string-append net "/etc/services"))) (add-after 'install 'move-static-libraries
#t))) (lambda* (#:key outputs #:allow-other-keys)
(add-after (let ((out (assoc-ref outputs "out"))
'install 'move-static-libraries (static (assoc-ref outputs "static")))
(lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append static "/lib"))
(let ((out (assoc-ref outputs "out")) (with-directory-excursion out
(static (assoc-ref outputs "static"))) (for-each (lambda (file)
(mkdir-p (string-append static "/lib")) (rename-file file
(with-directory-excursion out (string-append static "/"
(for-each (lambda (file) file)))
(rename-file file (find-files "lib" "\\.a$"))
(string-append static "/"
file)))
(find-files "lib" "\\.a$"))
;; Remove references to the static library from the '.la' ;; Remove references to the static library from the '.la'
;; files so that Libtool does the right thing when both ;; files so that Libtool does the right thing when both
;; the shared and static library is available. ;; the shared and static library is available.
(substitute* (find-files "lib" "\\.la$") (substitute* (find-files "lib" "\\.la$")
(("old_library=.*") "old_library=''\n"))) (("old_library=.*") "old_library=''\n")))
#t)))))) #t))))))
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
@ -1150,7 +1147,7 @@ (define-public util-linux
'()))) '())))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("net-base" ,net-base))) ;for tests ("net-base" ,net-base))) ;for tests
(home-page "https://www.kernel.org/pub/linux/utils/util-linux/") (home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
(synopsis "Collection of utilities for the Linux kernel") (synopsis "Collection of utilities for the Linux kernel")
(description "Util-linux is a diverse collection of Linux kernel (description "Util-linux is a diverse collection of Linux kernel