From 95ad844b6afaff38dbd35fcaf907dbac0689cb81 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 21 Apr 2021 14:00:38 +0200 Subject: [PATCH] gnu: jgmenu: Update to 4.3.0. * gnu/packages/xdisorg.scm (jgmenu): Update to 4.3.0. [arguments]: Add 'test-target' keyword. Remove 'fix-tests' phase. Use 'cc-for-target' instead of hard-coding gcc. --- gnu/packages/xdisorg.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 725ea0afd6..418fe73fdc 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2019 Kyle Andrews ;;; Copyright © 2019, 2020 Josh Holland ;;; Copyright © 2019 Tanguy Le Carrour -;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 David Wilson ;;; Copyright © 2020 Ivan Vilata i Balaguer ;;; Copyright © 2020 Brice Waegeneire @@ -2274,7 +2274,7 @@ (define-public autocutsel (define-public jgmenu (package (name "jgmenu") - (version "4.1.0") + (version "4.3.0") (source (origin (method git-fetch) @@ -2283,8 +2283,7 @@ (define-public jgmenu (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk")))) + (base32 "13y4ra2hjfqbn2vxyyn4ar5iqklbabyfwksbryc2gzxspw1vz4zq")))) (build-system gnu-build-system) (native-inputs `(("cppcheck" ,cppcheck) @@ -2299,17 +2298,12 @@ (define-public jgmenu ("libxrandr" ,libxrandr) ("pango" ,pango))) (arguments - `(#:phases + `(#:test-target "test" + #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "scripts/cppcheck-wrapper.sh" - (("--library=/usr/share/cppcheck/cfg/gnu\\.cfg") - "")) - #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") + (setenv "CC" ,(cc-for-target)) (invoke "./configure" (string-append "--prefix=" (assoc-ref outputs "out"))) #t)))))