guix-commits
[Top][All Lists]
Advanced

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

03/03: gnu: tiled: Use modular Qt.


From: Ricardo Wurmus
Subject: 03/03: gnu: tiled: Use modular Qt.
Date: Thu, 25 May 2017 04:23:09 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit 864cc7ef56d98838de4f7241bd60b345112593c9
Author: Ricardo Wurmus <address@hidden>
Date:   Thu May 25 10:00:04 2017 +0200

    gnu: tiled: Use modular Qt.
    
    * gnu/packages/game-development.scm (tiled)[inputs]: Remove qt; add qtbase 
and
    qtsvg.
    [native-inputs]: Add qttools.
    [arguments]: Override LRELEASE in translations.pro.
---
 gnu/packages/game-development.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index da3a850..b7bcdee 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -262,13 +262,22 @@ levels.")
                (base32
                 "1kcj2blrlfpghjv0qigip2qcbxfx7vv9i8nr4997hkwhsh6i2pjp"))))
     (build-system gnu-build-system)
-    (inputs `(("qt" ,qt)
-              ("zlib" ,zlib)))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtsvg" ,qtsvg)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("qttools" ,qttools)))
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (substitute* "translations/translations.pro"
+               (("LRELEASE =.*")
+                (string-append "LRELEASE = "
+                               (assoc-ref inputs "qttools")
+                               "/bin/lrelease\n")))
              (let ((out (assoc-ref outputs "out")))
                (system* "qmake"
                         (string-append "PREFIX=" out))))))))



reply via email to

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