gnu: jgmenu: Update to 4.0.1.

* gnu/packages/xdisorg.scm (jgmenu): Update to 4.0.1.
  [native-inputs]: Add cppcheck.
  [inputs]: Add glib and remove python.
  [arguments]: Remove fix-paths phase, add fix-tests phase and update
  configure phase.
This commit is contained in:
Guillaume Le Vaillant 2020-01-23 11:19:21 +01:00
parent 09e745185b
commit 8c5cde2546
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F

View file

@ -1960,7 +1960,7 @@ (define-public autocutsel
(define-public jgmenu (define-public jgmenu
(package (package
(name "jgmenu") (name "jgmenu")
(version "3.5") (version "4.0.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1970,34 +1970,35 @@ (define-public jgmenu
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0q0m3sskgmjv28gzvjkphgg3yhwzc9w9fj9i342pibb50impjazy")))) "1q0rpg2d96sn3rrdi8m7bngnxxqyxilpjxi7skiw4gvpiv1akxjp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("perl" ,perl) `(("cppcheck" ,cppcheck)
("perl" ,perl)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
("glib" ,glib)
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("libx11" ,libx11) ("libx11" ,libx11)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("pango" ,pango) ("pango" ,pango)))
("python" ,python)))
(arguments (arguments
'(#:phases (modify-phases %standard-phases `(#:phases
(add-after 'unpack 'fix-paths (modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'unpack 'fix-tests
(let ((python (assoc-ref inputs "python"))) (lambda _
(substitute* "src/jgmenu-pmenu.py" (substitute* "scripts/cppcheck-wrapper.sh"
(("#!/usr/bin/env python3") (("--library=/usr/share/cppcheck/cfg/gnu\\.cfg")
(string-append "#!" python "/bin/python3"))) ""))
#t))) #t))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (setenv "CC" "gcc")
(setenv "prefix" out) (invoke "./configure"
(setenv "CC" "gcc") (string-append "--prefix=" (assoc-ref outputs "out")))
#t)))))) #t)))))
(synopsis "Simple X11 menu") (synopsis "Simple X11 menu")
(description (description
"This is a simple menu for X11 designed for scripting and tweaking. It "This is a simple menu for X11 designed for scripting and tweaking. It