diff options
| author | Nathan Merkley <[email protected]> | 2025-03-09 17:14:07 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <[email protected]> | 2025-03-09 17:14:07 +0100 |
| commit | 99075df54affd0a0d0aab61b410651844d96decc (patch) | |
| tree | be27e441b2b1ead4937210133189aceebfc770db /gnu | |
| parent | be08c1d70d7d0e396b7fa8ac48d444517b25e33f (diff) | |
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 <[email protected]>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/fpga.scm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 1d2aa931b3..c09fe9bc76 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -34,6 +34,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system python) @@ -56,6 +57,7 @@ #:use-module (gnu packages gdb) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages glib) #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) @@ -416,22 +418,23 @@ FPGA place and route tool.") (origin (method url-fetch) (uri (list (string-append "mirror://sourceforge/gtkwave/" - "gtkwave-" version "/" - "gtkwave-" version ".tar.gz") + "gtkwave-gtk3-" version "/" + "gtkwave-gtk3-" version ".tar.gz") (string-append "https://gtkwave.sourceforge.net/" "gtkwave-" version ".tar.gz"))) (sha256 - (base32 "15w3x3zx5klqg1vjkakixw9zwfnkib7gf376knf5sryakd3bc1av")))) - (build-system gnu-build-system) + (base32 "0ikk49zyar5aiq7pg9whi4nfzq7xm8sz7bn3b6vaylkdimw4bajl")))) + (build-system glib-or-gtk-build-system) (native-inputs (list gperf pkg-config)) (inputs - (list tcl tk gtk+-2)) + (list gtk+ tcl tk)) (arguments (list #:configure-flags - #~(list (string-append "--with-tcl=" - (assoc-ref %build-inputs "tcl") - "/lib") + #~(list "--enable-gtk3" + (string-append "--with-tcl=" + (assoc-ref %build-inputs "tcl") + "/lib") (string-append "--with-tk=" (assoc-ref %build-inputs "tk") "/lib")))) |