gnu: Remove dependency on Python 2 for some Qt packages.

* gnu/packages/qt.scm (qtbase, qtmultimedia) [native-inputs]: Replace
  python-2 by python.
  (qtdeclarative)[native-inputs]: Replace python-2 by python, add
  python-wrapper.
This commit is contained in:
Hartmut Goebel 2019-11-26 19:33:15 +01:00
parent cff1e09504
commit d733a469d7
No known key found for this signature in database
GPG key ID: 634A8DFFD3F631DF

View file

@ -401,7 +401,7 @@ (define-public qtbase
("gperf" ,gperf) ("gperf" ,gperf)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-2) ("python" ,python)
("vulkan-headers" ,vulkan-headers) ("vulkan-headers" ,vulkan-headers)
("ruby" ,ruby))) ("ruby" ,ruby)))
(arguments (arguments
@ -756,7 +756,8 @@ (define-public qtdeclarative
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-2) ("python" ,python)
("python-wrapper" ,python-wrapper)
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qtxmlpatterns" ,qtxmlpatterns))) ("qtxmlpatterns" ,qtxmlpatterns)))
(inputs (inputs
@ -889,7 +890,7 @@ (define-public qtmultimedia
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-2) ("python" ,python)
("qtdeclarative" ,qtdeclarative))) ("qtdeclarative" ,qtdeclarative)))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)