me/guix
Archived
1
0
Fork 0
Code Activity

gnu: juCi++: Remove input labels.

Browse source 
* gnu/packages/text-editors.scm (jucipp)[arguments]: Use
SEARCH-INPUT-DIRECTORY & co as appropriate.
[inputs]: Remove labels.
This commit is contained in:
Marius Bakke 2022-02-09 16:48:02 +01:00
parent 3926379a59
commit d5b060ac4f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 20 additions and 18 deletions

38
gnu/packages/text-editors.scm
View file

@ -326,11 +326,12 @@ bindings and many of the powerful features of GNU Emacs.")
`(#:configure-flags '("-DBUILD_TESTING=ON") `(#:configure-flags '("-DBUILD_TESTING=ON")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-tiny-process-library (add-after 'unpack 'patch-tiny-process-library
(lambda _ (lambda* (#:key native-inputs inputs #:allow-other-keys)
(with-directory-excursion "lib/tiny-process-library" (with-directory-excursion "lib/tiny-process-library"
(substitute* '("process_unix.cpp" (substitute* '("process_unix.cpp"
"tests/io_test.cpp") "tests/io_test.cpp")
(("/bin/sh") (which "sh")))))) (("/bin/sh") (search-input-file (or native-inputs inputs)
"bin/sh"))))))
(add-after 'unpack 'disable-git-test (add-after 'unpack 'disable-git-test
(lambda _ (lambda _
(substitute* "tests/CMakeLists.txt" (substitute* "tests/CMakeLists.txt"
@ -348,11 +349,10 @@ bindings and many of the powerful features of GNU Emacs.")
(setenv "HOME" "/etc") (setenv "HOME" "/etc")
;; Most tests require an X server. ;; Most tests require an X server.
(let ((xorg-server (assoc-ref inputs "xorg-server")) (let ((xvfb (search-input-file inputs "bin/Xvfb"))
(display ":1")) (display ":1"))
(setenv "DISPLAY" display) (setenv "DISPLAY" display)
(system (string-append xorg-server "/bin/Xvfb " (system (string-append xvfb " " display " &")))))
display " &")))))
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; The package needs GTK+ and GtkSourceView on XDG_DATA_DIRS ;; The package needs GTK+ and GtkSourceView on XDG_DATA_DIRS
@ -361,26 +361,28 @@ bindings and many of the powerful features of GNU Emacs.")
;; XXX: Ideally we'd reuse glib-or-gtk-wrap here, but it ;; XXX: Ideally we'd reuse glib-or-gtk-wrap here, but it
;; does not pick up $gtksourceview/share/gtksourceview-3.0. ;; does not pick up $gtksourceview/share/gtksourceview-3.0.
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(gtk+ (assoc-ref inputs "gtk+")) (gtk+ (dirname (search-input-file inputs
(gtksourceview (assoc-ref inputs "gtksourceview")) "share/gtk-3.0")))
(shared-mime-info (assoc-ref inputs "shared-mime-info"))) (gtksourceview (dirname (search-input-directory
inputs
"share/gtksourceview-3.0")))
(shared-mime-info (dirname (search-input-directory
inputs "share/mime"))))
(wrap-program (string-append out "/bin/juci") (wrap-program (string-append out "/bin/juci")
`("XDG_DATA_DIRS" ":" prefix `("XDG_DATA_DIRS" ":" prefix
(,(string-join (,(string-join
(map (lambda (pkg) (list out gtk+ gtksourceview shared-mime-info)
(string-append pkg "/share"))
(list out gtk+ gtksourceview shared-mime-info))
":")))))))))) ":"))))))))))
(native-inputs (native-inputs
(list pkg-config xorg-server-for-tests)) (list pkg-config xorg-server-for-tests))
(inputs (inputs
`(("aspell" ,aspell) (list aspell
("boost" ,boost) boost
("ctags" ,universal-ctags) clang-11 ;XXX: must be the same version as Mesas LLVM
("gtkmm" ,gtkmm-3) gtkmm-3
("gtksourceviewmm" ,gtksourceviewmm) gtksourceviewmm
("libclang" ,clang-11) ;XXX: must be the same version as Mesas LLVM libgit2
("libgit2" ,libgit2))) universal-ctags))
(synopsis "Lightweight C++ IDE") (synopsis "Lightweight C++ IDE")
(description (description
"juCi++ is a small @acronym{IDE, Integrated Development Environment} "juCi++ is a small @acronym{IDE, Integrated Development Environment}