summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2016-07-29 19:19:46 +0200
committerAndreas Enge <andreas@enge.fr>2016-08-04 09:56:03 +0200
commit2470d779c9105c7ac7d03bd27bd53da0548384c4 (patch)
tree124dd50424c553fbeeb53b819143cdab662c58e8 /gnu/packages
parentcce28b0c3ad14c42e08500bb51b23ba02ed449a2 (diff)
downloadguix-2470d779c9105c7ac7d03bd27bd53da0548384c4.tar.gz
gnu: qt: Update to 5.6.1-1.
* gnu/packages/qt.scm (qt): Update to 5.6.1-1.

Co-authored-by: David Craven <david@craven.ch>
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/qt.scm12
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6ef02b1142..9f59cf684d 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")))