Commit 8b141b95 authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

paraview, vite: Adjust to Qt upgrade.

Guix commit e3d67b71cb0ccd5ad5563ebaffe6adc6c96c0c7c changes 'qtbase' to
point to 'qtbase-6'.  To allow for backward compatibility with Guix
1.3.0, use 'specification->package' to explicitly refer to qtbase@5 (we
cannot refer to the 'qtbase-5' variable since it didn't exist back
then).

* inria/staging.scm (S): New variable.
(paraview)[native-inputs, inputs]: Use it.
* inria/vite.scm (S): New variable.
(vite)[inputs, native-inputs]: Use it.
parent 6309102b
......@@ -8,6 +8,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages gl)
#:use-module (gnu packages image-processing)
#:use-module (gnu packages maths)
......@@ -24,6 +25,8 @@
;;;
;;; Code:
(define S specification->package)
(define-public paraview
;; TODO: This should be part of Guix proper, but first, we should try
;; unbundling VTK.
......@@ -53,12 +56,12 @@
;; 'VTK_CXX_COMPILER' as the absolute file name of 'c++'. Remove that so
;; we don't keep a reference to GCC.
(native-inputs
`(("qttools" ,qttools)))
`(("qttools" ,(S "qttools@5"))))
(inputs
`(("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns)
`(("qtbase" ,(S "qtbase@5"))
("qtsvg" ,(S "qtsvg@5"))
("qtx11extras" ,(S "qtx11extras@5"))
("qtxmlpatterns" ,(S "qtxmlpatterns@5"))
("libx11" ,libx11)
("libxt" ,libxt)
("mesa" ,mesa)
......
;;; This module extends GNU Guix and is licensed under the same terms, those
;;; of the GNU GPL version 3 or (at your option) any later version.
;;;
;;; Copyright © 2019 Inria
;;; Copyright © 2019, 2021 Inria
(define-module (inria vite)
#:use-module (guix packages)
......@@ -9,9 +9,12 @@
#:use-module (guix licenses)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages qt)
#:use-module (gnu packages gl))
(define S specification->package)
(define-public vite
(let ((revision 1610))
(package
......@@ -39,11 +42,11 @@
)
#:tests? #f))
(inputs
`(("qtbase" ,qtbase)
`(("qtbase" ,(S "qtbase@5"))
("mesa" ,mesa)
("glu" ,glu)))
(native-inputs
`(("qttools" ,qttools)))
`(("qttools" ,(S "qttools@5"))))
(home-page "http://vite.gforge.inria.fr/")
(synopsis "Visualize program execution traces")
(description
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment