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.
This commit is contained in:
parent
b33e83ea9c
commit
95ad844b6a
|
@ -29,7 +29,7 @@
|
||||||
;;; Copyright © 2019 Kyle Andrews <kyle.c.andrews@gmail.com>
|
;;; Copyright © 2019 Kyle Andrews <kyle.c.andrews@gmail.com>
|
||||||
;;; Copyright © 2019, 2020 Josh Holland <josh@inv.alid.pw>
|
;;; Copyright © 2019, 2020 Josh Holland <josh@inv.alid.pw>
|
||||||
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
|
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
|
||||||
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
|
;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
|
||||||
;;; Copyright © 2020 David Wilson <david@daviwil.com>
|
;;; Copyright © 2020 David Wilson <david@daviwil.com>
|
||||||
;;; Copyright © 2020 Ivan Vilata i Balaguer <ivan@selidor.net>
|
;;; Copyright © 2020 Ivan Vilata i Balaguer <ivan@selidor.net>
|
||||||
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
|
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
|
||||||
|
@ -2274,7 +2274,7 @@ (define-public autocutsel
|
||||||
(define-public jgmenu
|
(define-public jgmenu
|
||||||
(package
|
(package
|
||||||
(name "jgmenu")
|
(name "jgmenu")
|
||||||
(version "4.1.0")
|
(version "4.3.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -2283,8 +2283,7 @@ (define-public jgmenu
|
||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32 "13y4ra2hjfqbn2vxyyn4ar5iqklbabyfwksbryc2gzxspw1vz4zq"))))
|
||||||
"1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk"))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("cppcheck" ,cppcheck)
|
`(("cppcheck" ,cppcheck)
|
||||||
|
@ -2299,17 +2298,12 @@ (define-public jgmenu
|
||||||
("libxrandr" ,libxrandr)
|
("libxrandr" ,libxrandr)
|
||||||
("pango" ,pango)))
|
("pango" ,pango)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:test-target "test"
|
||||||
|
#:phases
|
||||||
(modify-phases %standard-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
|
(replace 'configure
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(setenv "CC" "gcc")
|
(setenv "CC" ,(cc-for-target))
|
||||||
(invoke "./configure"
|
(invoke "./configure"
|
||||||
(string-append "--prefix=" (assoc-ref outputs "out")))
|
(string-append "--prefix=" (assoc-ref outputs "out")))
|
||||||
#t)))))
|
#t)))))
|
||||||
|
|
Loading…
Reference in a new issue