aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/xdisorg.scm
diff options
context:
space:
mode:
authorGuillaume Le Vaillant <glv@posteo.net>2020-01-23 11:19:21 +0100
committerGuillaume Le Vaillant <glv@posteo.net>2020-01-23 11:53:52 +0100
commit8c5cde2546b8bcca2285d5fa6545adeb5076b74e (patch)
tree5f223fa139286c013d143bbe0c425be885c607c2 /gnu/packages/xdisorg.scm
parent09e745185bd6326a77a6fa045cdd82deb133402e (diff)
downloadpatches-8c5cde2546b8bcca2285d5fa6545adeb5076b74e.tar
patches-8c5cde2546b8bcca2285d5fa6545adeb5076b74e.tar.gz
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.
Diffstat (limited to 'gnu/packages/xdisorg.scm')
-rw-r--r--gnu/packages/xdisorg.scm39
1 files changed, 20 insertions, 19 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index f60b2d040b..ecefab1dbb 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1960,7 +1960,7 @@ The cutbuffer and clipboard selection are always synchronized.")
(define-public jgmenu
(package
(name "jgmenu")
- (version "3.5")
+ (version "4.0.1")
(source
(origin
(method git-fetch)
@@ -1970,34 +1970,35 @@ The cutbuffer and clipboard selection are always synchronized.")
(file-name (git-file-name name version))
(sha256
(base32
- "0q0m3sskgmjv28gzvjkphgg3yhwzc9w9fj9i342pibb50impjazy"))))
+ "1q0rpg2d96sn3rrdi8m7bngnxxqyxilpjxi7skiw4gvpiv1akxjp"))))
(build-system gnu-build-system)
(native-inputs
- `(("perl" ,perl)
+ `(("cppcheck" ,cppcheck)
+ ("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs
`(("cairo" ,cairo)
+ ("glib" ,glib)
("librsvg" ,librsvg)
("libx11" ,libx11)
("libxml2" ,libxml2)
("libxrandr" ,libxrandr)
- ("pango" ,pango)
- ("python" ,python)))
+ ("pango" ,pango)))
(arguments
- '(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((python (assoc-ref inputs "python")))
- (substitute* "src/jgmenu-pmenu.py"
- (("#!/usr/bin/env python3")
- (string-append "#!" python "/bin/python3")))
- #t)))
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (setenv "prefix" out)
- (setenv "CC" "gcc")
- #t))))))
+ `(#: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")
+ (invoke "./configure"
+ (string-append "--prefix=" (assoc-ref outputs "out")))
+ #t)))))
(synopsis "Simple X11 menu")
(description
"This is a simple menu for X11 designed for scripting and tweaking. It