1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-13 18:40:57 +02:00

gnu: gtkwave: Build with GTK3.

* gnu/packages/fpga.scm (gtkwave): Use GTK3 source.
[build-system]: Use glib-or-gtk-build-system.
[inputs]: Add gtk+. Remove gtk+-2.
[arguments]: Enable GTK3 build.

Change-Id: I2deab104beb18ccc064925190ede4a33098edbef
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
This commit is contained in:
Nathan Merkley 2025-03-09 17:14:07 +01:00 committed by Nicolas Goaziou
parent be08c1d70d
commit 99075df54a
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D

View file

@ -34,6 +34,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system python) #:use-module (guix build-system python)
@ -56,6 +57,7 @@
#:use-module (gnu packages gdb) #:use-module (gnu packages gdb)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
@ -416,20 +418,21 @@ FPGA place and route tool.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "mirror://sourceforge/gtkwave/" (uri (list (string-append "mirror://sourceforge/gtkwave/"
"gtkwave-" version "/" "gtkwave-gtk3-" version "/"
"gtkwave-" version ".tar.gz") "gtkwave-gtk3-" version ".tar.gz")
(string-append "https://gtkwave.sourceforge.net/" (string-append "https://gtkwave.sourceforge.net/"
"gtkwave-" version ".tar.gz"))) "gtkwave-" version ".tar.gz")))
(sha256 (sha256
(base32 "15w3x3zx5klqg1vjkakixw9zwfnkib7gf376knf5sryakd3bc1av")))) (base32 "0ikk49zyar5aiq7pg9whi4nfzq7xm8sz7bn3b6vaylkdimw4bajl"))))
(build-system gnu-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
(list gperf pkg-config)) (list gperf pkg-config))
(inputs (inputs
(list tcl tk gtk+-2)) (list gtk+ tcl tk))
(arguments (arguments
(list #:configure-flags (list #:configure-flags
#~(list (string-append "--with-tcl=" #~(list "--enable-gtk3"
(string-append "--with-tcl="
(assoc-ref %build-inputs "tcl") (assoc-ref %build-inputs "tcl")
"/lib") "/lib")
(string-append "--with-tk=" (string-append "--with-tk="