TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: parted: Support building for the Hurd.

Browse source 
* gnu/packages/disk.scm (parted)[inputs]: Remove lvm2, add hurd-minimal
when building for the Hurd.
[arguments]: Add configure-flag '--disable-device-mapper' when building for
the Hurd.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
This commit is contained in:
Janneke Nieuwenhuizen 2023-05-23 14:29:21 +02:00 committed by Josselin Poiret
parent c8799fafa4
commit 451b2db3df
No known key found for this signature in database
GPG key ID: 505E40B916171A8A
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/disk.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
@ -69,6 +69,7 @@ (define-module (gnu packages disk)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages hurd)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
@ -254,17 +255,24 @@ (define-public parted
"18h51i3x5cbqhlj5rm23m9sfw63gaaby5czln5w6qpqj3ifdsf29"))))
(build-system gnu-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-locales-and-python
(lambda _
(substitute* "tests/t0251-gpt-unicode.sh"
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
(substitute* "tests/msdos-overlap"
(("/usr/bin/python") (which "python"))))))))
(list
#:configure-flags (if (target-hurd?)
#~'("--disable-device-mapper")
#~'())
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-locales-and-python
(lambda _
(substitute* "tests/t0251-gpt-unicode.sh"
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
(substitute* "tests/msdos-overlap"
(("/usr/bin/python") (which "python"))))))))
(inputs
(list lvm2 readline
`(,util-linux "lib")))
`(,@(if (target-hurd?)
(list hurd-minimal)
(list lvm2))
,readline
(,util-linux "lib")))
(native-inputs
(list gettext-minimal