guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: qt: Update to 5.6.1-1.


From: Andreas Enge
Subject: 02/02: gnu: qt: Update to 5.6.1-1.
Date: Thu, 4 Aug 2016 08:32:13 +0000 (UTC)

andreas pushed a commit to branch master
in repository guix.

commit 2470d779c9105c7ac7d03bd27bd53da0548384c4
Author: Andreas Enge <address@hidden>
Date:   Fri Jul 29 19:19:46 2016 +0200

    gnu: qt: Update to 5.6.1-1.
    
    * gnu/packages/qt.scm (qt): Update to 5.6.1-1.
    
    Co-authored-by: David Craven <address@hidden>
---
 gnu/packages/qt.scm |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6ef02b1..9f59cf6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -60,7 +60,7 @@
 (define-public qt
   (package
     (name "qt")
-    (version "5.5.1")
+    (version "5.6.1-1")
     (source (origin
              (method url-fetch)
              (uri
@@ -72,7 +72,7 @@
                  version ".tar.xz"))
              (sha256
                (base32
-                 "0615cn4n3n78v48lnmapqz2jizm2pzrjwvsjlnsf4awrsiiqw0kg"))
+                 "1nrn2wivjwdxc9q03gpsi336gcl9l2axi0xjbzsha5v6akmsf26f"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -152,6 +152,14 @@
        #:parallel-build? #f
        #:phases
        (modify-phases %standard-phases
+         (add-after 'configure 'patch-bin-sh
+           (lambda _
+             (substitute* '("qtbase/config.status"
+                            "qtbase/configure"
+                            "qtbase/mkspecs/features/qt_functions.prf"
+                            "qtbase/qmake/library/qmakebuiltins.cpp")
+                          (("/bin/sh") (which "sh")))
+             #t))
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))



reply via email to

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