diff options
| author | Efraim Flashner <[email protected]> | 2022-10-12 14:33:56 +0300 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2022-10-12 14:36:44 +0300 |
| commit | 322917aeb8e672c21378fd371a5cff4a9f0c2520 (patch) | |
| tree | 70229faa39f14caa09b769153453c3898f64f7fc /gnu/packages/fpga.scm | |
| parent | 407f017663c97ebfe48e3cb304bf97bf2557f83f (diff) | |
| parent | e1baf802ccd8af4f7b416b0987db706f2dbfc42f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/kde-frameworks.scm
gnu/packages/video.scm
Diffstat (limited to 'gnu/packages/fpga.scm')
| -rw-r--r-- | gnu/packages/fpga.scm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 11c56477a8..082b0c08ed 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Vinicius Monego <[email protected]> ;;; Copyright © 2021 Andrew Miloradovsky <[email protected]> ;;; Copyright © 2022 Christian Gelinek <[email protected]> +;;; Copyright © 2022 jgart <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages fpga) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -352,7 +354,7 @@ FOSS FPGA place and route tool.") (define-public gtkwave (package (name "gtkwave") - (version "3.3.111") + (version "3.3.113") (source (origin (method url-fetch) @@ -362,23 +364,20 @@ FOSS FPGA place and route tool.") (string-append "http://gtkwave.sourceforge.net/" "gtkwave-" version ".tar.gz"))) (sha256 - (base32 "15n2gv2hd7h23cci95ij7yr71fkxppb209sfdsmmngh3fik09rpn")))) + (base32 "1zqkfchmns5x90qxa8kg39bfhax3vxf1mrdz3lhyb9fz1gp4difn")))) (build-system gnu-build-system) (native-inputs (list gperf pkg-config)) (inputs - `(("tcl" ,tcl) - ("tk" ,tk) - ("gtk+-2" ,gtk+-2))) + (list tcl tk gtk+-2)) (arguments - `(#:configure-flags - (list (string-append "--with-tcl=" - (assoc-ref %build-inputs "tcl") - "/lib") - (string-append "--with-tk=" - (assoc-ref %build-inputs "tk") - "/lib")))) - + (list #:configure-flags + #~(list (string-append "--with-tcl=" + (assoc-ref %build-inputs "tcl") + "/lib") + (string-append "--with-tk=" + (assoc-ref %build-inputs "tk") + "/lib")))) (synopsis "Waveform viewer for FPGA simulator trace files") (description "This package is a waveform viewer for FPGA simulator trace files (@dfn{FST}).") |