summary refs log tree commit diff
path: root/gnu/packages/toolkits.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/toolkits.scm')
-rw-r--r--gnu/packages/toolkits.scm131
1 files changed, 85 insertions, 46 deletions
diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm
index e980438ca9..fd3385122e 100644
--- a/gnu/packages/toolkits.scm
+++ b/gnu/packages/toolkits.scm
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,8 +19,10 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages toolkits)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages sdl)
+  #:use-module (guix gexp)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -28,7 +32,7 @@
 (define-public imgui
   (package
     (name "imgui")
-    (version "1.86")
+    (version "1.87")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -37,68 +41,103 @@
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "02a7b05zrka20jhzag2jb4jl624i1m456bsv69jb9zgys2p9dv1n"))
+                "10qil22s5qak3as41787iz273sibpq1bq66bakgn7yvhj5fym6hz"))
               (modules '((guix build utils)))
               (snippet
-               '(begin
-                  ;; Contains fonts and other unneeded files.
-                  (delete-file-recursively "misc")))))
+               ;; Remove bundled fonts.
+               '(delete-file-recursively "misc/fonts"))))
     (outputs '("out" "doc"))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ;no test suite
-       #:modules ((guix build gnu-build-system)
+     (list
+      #:tests? #f                       ;no test suite
+      #:modules '((guix build gnu-build-system)
                   (guix build utils)
                   (ice-9 ftw)
                   (srfi srfi-26))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'adjust-includes
-           (lambda _
-             (substitute* (find-files "." "(\\.cpp|\\.mm)$")
-               (("#include <SDL")
-                "#include <SDL2/SDL"))))
-         (delete 'configure)
-         (replace 'build
-           (lambda _
-             ;; Build main library.
-             (invoke ,(cc-for-target) "-I" (getcwd)
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-includes
+            (lambda _
+              (substitute* (find-files "." "(\\.cpp|\\.mm)$")
+                (("#include <SDL")
+                 "#include <SDL2/SDL"))))
+          (delete 'configure)
+          (replace 'build
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; Build main library.
+              (apply invoke #$(cc-for-target) "-I" (getcwd)
+                     "-I" (search-input-directory inputs "include/freetype2")
                      "-g" "-O2" "-fPIC" "-shared"
                      "-lGL" "-lSDL2" "-lglfw"
                      "-o" "libimgui.so"
                      "imgui.cpp"
                      "imgui_draw.cpp"
+                     "imgui_tables.cpp"
+                     "imgui_widgets.cpp"
                      ;; Include the supported backends.
                      "backends/imgui_impl_glfw.cpp"
                      "backends/imgui_impl_sdl.cpp"
                      "backends/imgui_impl_opengl2.cpp"
-                     "backends/imgui_impl_opengl3.cpp")))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (doc (assoc-ref outputs "doc"))
-                    (header? (cut string-suffix? ".h" <>))
-                    (imgui-headers (scandir "." header?))
-                    (backend-headers (find-files
-                                      "backends"
-                                      "(glfw|opengl|sdl|vulkan).*\\.h$")))
-               (install-file "libimgui.so" (string-append out "/lib"))
-               ;; Install headers.
-               (for-each (lambda (f)
-                           (install-file f (string-append out "/include/imgui")))
-                         imgui-headers)
-               (for-each (lambda (f)
-                           (install-file f (string-append
-                                            out "/include/imgui/backends")))
-                         backend-headers)
-               ;; Install examples.
-               (copy-recursively
-                "examples" (string-append
-                            doc "/share/imgui/examples"))))))))
-    (inputs (list glfw mesa sdl2))
+                     "backends/imgui_impl_opengl3.cpp"
+                     ;; Include wrappers for C++ standard library (STL) and
+                     ;; fontconfig.
+                     (find-files "misc" "\\.cpp$"))))
+          (replace 'install
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (doc (assoc-ref outputs "doc"))
+                     (header? (cut string-suffix? ".h" <>))
+                     (imgui-headers (scandir "." header?))
+                     (backend-headers (find-files
+                                       "backends"
+                                       "(glfw|opengl|sdl|vulkan).*\\.h$"))
+                     (misc-headers (find-files "misc" "\\.h$")))
+                (install-file "libimgui.so" (string-append out "/lib"))
+                ;; Install headers.
+                (for-each (lambda (f)
+                            (install-file f (string-append out "/include/imgui")))
+                          imgui-headers)
+                (for-each (lambda (f)
+                            (install-file f (string-append
+                                             out "/include/imgui/backends")))
+                          backend-headers)
+                (for-each (lambda (f)
+                            (install-file f (string-append
+                                             out "/include/imgui/" (dirname f))))
+                          misc-headers)
+                ;; Install examples.
+                (copy-recursively
+                 "examples" (string-append
+                             doc "/share/imgui/examples"))))))))
+    (inputs (list fontconfig glfw mesa sdl2))
     (home-page "https://github.com/ocornut/imgui")
-    (synopsis "Graphical user interface library for C++")
+    (synopsis "Immediate-mode C++ GUI library with minimal dependencies")
     (description "@code{dear imgui} (also know as ImGui) is a graphical user
-interface library for C++.  It outputs vertex buffers that can be rendered in
-a 3D application.  It is fast, renderer agnostic and self-contained.")
+interface library for C++.  It creates optimized vertex buffers that you can
+render anytime in your 3D-pipeline-enabled application.  It's fast, portable,
+renderer-agnostic, and self-contained, without external dependencies.
+
+ImGui is aimed at content creation, visualization, and debugging tools as
+opposed to average end-user interfaces.  Hence it favors simplicity and
+productivity but lacks certain features often found in higher-level libraries.
+It is particularly suited to integration in game engine tooling, real-time 3D
+applications, full-screen applications, and embedded platforms without
+standard operating system features.")
     (license license:expat)))
+
+(define-public imgui-1.86
+  (package
+    (inherit imgui)
+    (name "imgui")
+    (version "1.86")
+    (source (origin
+              (inherit (package-source imgui))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/ocornut/imgui")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "02a7b05zrka20jhzag2jb4jl624i1m456bsv69jb9zgys2p9dv1n"))))))