diff options
| author | 宋文武 <iyzsong@gmail.com> | 2015-01-03 14:12:01 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@gmail.com> | 2015-01-11 19:37:33 +0800 |
| commit | 5b490ab52f2cdb1b4cd72c90d460af3666da61f7 (patch) | |
| tree | b6cc49e2508ee3f090888ea6c1e7647d953f0662 | |
| parent | cd287ba16211ceec970c5af698e52d475952b183 (diff) | |
| download | guix-5b490ab52f2cdb1b4cd72c90d460af3666da61f7.tar guix-5b490ab52f2cdb1b4cd72c90d460af3666da61f7.tar.gz | |
gnu: qt: Update to 5.4.0.
* gnu/packages/qt.scm (qt): Update to 5.4.0.
[origin]: Add snippet.
| -rw-r--r-- | gnu/packages/qt.scm | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 30b772d4d9..42df93321d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,7 +82,7 @@ X11 (yet).") (define-public qt (package (name "qt") - (version "5.3.2") + (version "5.4.0") (source (origin (method url-fetch) (uri (string-append "http://download.qt-project.org/official_releases/qt/" @@ -91,7 +92,14 @@ X11 (yet).") version ".tar.xz")) (sha256 (base32 - "1w4v53889kqpwxw45wcqz5bi6zx8xp434jpafk1vlmyb8hrzjnvz")))) + "176351k8ngczb324i8bbkrsz9pby7cvy2qnixfjwybzxp53xzndj")) + (snippet + '(begin + ;; Remove broken symlinks. + (delete-file "qtwebengine/src/3rdparty/chromium/third_party/\ +mesa/src/src/gallium/state_trackers/d3d1x/w32api") + (delete-file "qtwebengine/src/3rdparty/chromium/third_party/\ +webrtc/tools/e2e_quality/audio/perf"))))) (build-system gnu-build-system) (propagated-inputs `(("mesa" ,mesa))) @@ -129,7 +137,9 @@ X11 (yet).") (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* '("configure" "qtbase/configure") - (("/bin/pwd") (which "pwd"))) + (("/bin/pwd") (which "pwd"))) + (substitute* "qtbase/src/corelib/global/global.pri" + (("/bin/ls") (which "ls"))) ;; do not pass "--enable-fast-install", which makes the ;; configure process fail (zero? (system* |