guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

15/30: gnu: phonon: Enable building the Qt Designer plugin.


From: Hartmut Goebel
Subject: 15/30: gnu: phonon: Enable building the Qt Designer plugin.
Date: Fri, 13 Oct 2017 09:29:04 -0400 (EDT)

htgoebel pushed a commit to branch master
in repository guix.

commit ba81085b2594e63c7b89c2c8517ca9f42d7feed2
Author: Hartmut Goebel <address@hidden>
Date:   Tue Sep 19 19:45:58 2017 +0200

    gnu: phonon: Enable building the Qt Designer plugin.
    
    Add native-inputs pkg-config, qttools and update comments.
    
    This enables building the Qt Designer plugin.
    
    * gnu/packages/kde-frameworks.scm (phonon): [native-inputs]: Add pkg-config,
      qttools.  [arguments]<#configure-flags>: Remove
      PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT, to avoid installing the
      Phonon-Qt-extension into /gnu/store/…-qtbase-…/.
---
 gnu/packages/kde-frameworks.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index cb84750..a57ff4f 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -138,16 +138,17 @@ common build settings used in software produced by the 
KDE community.")
                 "177647r2jqfm32hqcz2nqfqv6v48hn5ab2vc31svba2wz23fkgk7"))))
     (build-system cmake-build-system)
     (native-inputs
-     ;; TODO: Add qttools to build the Qt Designer plugin.
      ;; TODO: Think about adding pulseaudio. Is it required for sound?
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     ;; TODO: Add building the super experimental QML support
+     `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("pkg-config" ,pkg-config)
+       ("qttools", qttools)))
     (inputs
      `(("qtbase" ,qtbase)))
     (arguments
      `(#:configure-flags
        '("-DCMAKE_CXX_FLAGS=-fPIC"
-         "-DPHONON_BUILD_PHONON4QT5=ON"
-         "-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON")
+         "-DPHONON_BUILD_PHONON4QT5=ON")
        #:phases
        (modify-phases %standard-phases
          (add-before 'install 'patch-installdir



reply via email to

[Prev in Thread] Current Thread [Next in Thread]