summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2017-03-03 12:35:17 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2017-03-04 11:32:53 +0100
commit5bbf31ccba8c86730fac1dbe081032b1995ce31b (patch)
treefdaf1916c87ec001be659a68bdbf457e3eb8a6de
parentb2e3d59c50d1d367799886318f0e38f4fb9fc0aa (diff)
downloadguix-5bbf31ccba8c86730fac1dbe081032b1995ce31b.tar.gz
gnu: stellarium: Use modular Qt.
* gnu/packages/astronomy.scm (stellarium)[inputs]: Remove qt.
Add qtbase, qtmultimedia, qtscript, qtserialport.
[native-inputs]: Add qtbase, qttools.
-rw-r--r--gnu/packages/astronomy.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 43506a7bc2..2695530fee 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