bug#25948: [PATCH] gnu: stellarium: Use modular Qt.

[Marius Bakke]

Danny Milosavljevic <address@hidden> writes:

> * gnu/packages/astronomy.scm (stellarium)[inputs]: Remove qt.
> Add qtbase, qtmultimedia, qtscript, qtserialport.
> [native-inputs]: Add qtbase, qttools.

LGTM, assuming the package still works :)

Also double check that `qtbase` and `qttools` are not listed in
`guix gc -R $(./pre-inst-env guix build stellarium)`.

> ---
>  gnu/packages/astronomy.scm | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
> index 43506a7bc..2695530fe 100644
> --- a/gnu/packages/astronomy.scm
> +++ b/gnu/packages/astronomy.scm
> @@ -128,11 +128,16 @@ programs for the manipulation and analysis of 
> astronomical data.")
>                 "04avigz8i8mi2x6x71bqr9np85n1p9qnvbj2hxr947f1jv22zr8g"))))
>      (build-system cmake-build-system)
>      (inputs
> -     `(("qt"   ,qt)
> +     `(("qtbase" ,qtbase)
> +       ("qtmultimedia" ,qtmultimedia)
> +       ("qtscript" ,qtscript)
> +       ("qtserialport" ,qtserialport)
>         ("zlib" ,zlib)))
>      (native-inputs
>       `(("gettext" ,gettext-minimal) ; xgettext is used at compile time
> -       ("perl" ,perl))) ; For pod2man
> +       ("perl" ,perl) ; For pod2man
> +       ("qtbase" ,qtbase) ; Qt MOC is needed at compile time
> +       ("qttools" ,qttools)))
>      (arguments
>        `(#:test-target "tests"
>          #:phases (modify-phases %standard-phases

signature.asc
Description: PGP signature