add pkg-config and python to upstream (udis86)

3 files changed, 49 insertions, 18 deletions

diff --git a/sigils/packages/hyprland.scm b/sigils/packages/hyprland.scm
index cb697c4..ba239cf 100644
--- a/sigils/packages/hyprland.scm
+++ b/sigils/packages/hyprland.scm
@@ -34,6 +34,21 @@
   #:use-module (gnu packages xorg)
   #:use-module (sigils packages upstream))
 
+(define mesa-opengl
+  (package/inherit mesa
+    (name "mesa-opengl")
+    ;; (source (origin
+    ;;           (inherit (package-source mesa))))
+    (inputs (modify-inputs (package-inputs mesa)
+              (append libglvnd)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments mesa)
+       ((#:configure-flags flags)
+        #~(cons* "-Dopengl=true"
+                 "-Degl=enabled"
+                 "-Dglvnd=enabled"
+                 #$flags))))))
+
 ;;; Hyprland
 
 (define hyprland-version "0.44.1")
@@ -55,6 +70,7 @@
     (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
                          pkg-config))
     (inputs (list pixman))
+    (arguments '(#:build-type "release"))
     (synopsis "Hyprland utilities library used across the ecosystem")
     (description "Hyprutils is a small C++ library for utilities used across
 the Hypr* ecosystem.")
@@ -77,7 +93,8 @@ the Hypr* ecosystem.")
     (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
                          pkg-config))
     (inputs (list pugixml))
-    (arguments (list #:tests? #f)) ;; No tests
+    (arguments '(#:tests? #f ;; No tests
+                 #:build-type "release"))
     (synopsis "A Hyprland implementation of wayland-scanner")
     (description "Hyprwayland-scanner automatically generates properly
 RAII-ready C++ bindings for Wayland protocols, for either servers or
@@ -113,7 +130,8 @@ clients.")
                   hwdata
                   libseat))
     (arguments (list #:cmake cmake-3.30
-                     #:tests? #f)) ;; TODO: tests use wayland yada yada
+                     #:tests? #f ;; TODO: tests use wayland yada yada
+                     #:build-type "release"))
     (synopsis "Lightweight rendering library")
     (description "Aquamarine is a very light linux rendering backend
 library. It provides basic abstractions for an application to render on a
@@ -136,6 +154,7 @@ Wayland session (in a window) or a native DRM session.")
     (build-system meson-build-system)
     (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
                          pkg-config))
+    (arguments '(#:build-type "release"))
     (synopsis "Wayland protocol extensions for Hyprland")
     (description "This repository exists in an effort to bridge the gap
 between Hyprland and KDE/Gnome's functionality.
@@ -162,6 +181,7 @@ are small, hyprland-exclusive plumbing protocols anyways.")
     (build-system cmake-build-system)
     (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
                          pkg-config))
+    (arguments '(#:build-type "release"))
     (synopsis "Hyprland configuration language")
     (description "The hypr configuration language is a configuration language
 for linux applications.")
@@ -188,7 +208,8 @@ for linux applications.")
                   cairo
                   librsvg
                   tomlplusplus))
-    (arguments '(#:tests? #f)) ;; Tests need a loaded cursor theme. TODO: fix
+    (arguments '(#:tests? #f ;; Tests need a loaded cursor theme. TODO: fix
+                 #:build-type "release"))
     (synopsis "The hyprland cursor format, library and utilities")
     (description "Hyprcursor is a new cursor theme format made as a
 replacement for XCursor.")
@@ -210,7 +231,8 @@ replacement for XCursor.")
     (build-system meson-build-system)
     (arguments (list #:meson meson-1.5
                      #:configure-flags '(list "-Dxwayland=enabled"
-                                              "-Dsystemd=disabled")))
+                                              "-Dsystemd=disabled")
+                     #:build-type "release"))
     (native-inputs (list gcc-14 ;; TODO: remove this when GCC 14 is the default
                          pkg-config
                          cmake-minimal
@@ -260,6 +282,7 @@ replacement for XCursor.")
     (native-inputs (package-native-inputs hyprland))
     (inputs (modify-inputs (package-inputs hyprland)
               (append hyprland)))
+    (arguments '(#:build-type "release"))
     (synopsis "awesome / dwm like workspaces for hyprland")
     (description "hyprland plugin for separate sets of workspaces on each monitor")
     (license license:bsd-3)))
@@ -283,6 +306,7 @@ replacement for XCursor.")
       (native-inputs (package-native-inputs hyprland))
       (inputs (modify-inputs (package-inputs hyprland)
                 (append hyprland)))
+      (arguments '(#:build-type "release"))
       (synopsis "awesome / dwm like workspaces for hyprland")
       (description "hyprland plugin for separate sets of workspaces on each monitor")
       (license license:bsd-3))))
@@ -313,7 +337,8 @@ replacement for XCursor.")
                   libwebp
                   hyprlang
                   hyprutils))
-    (arguments '(#:tests? #f)) ;; No tests
+    (arguments '(#:tests? #f ;; No tests
+                 #:build-type "release"))
     (synopsis "Wallpaper utility with IPC controls")
     (description "Hyprpaper is a wallpaper utility for Hyprland with the
 ability to dynamically change wallpapers through sockets")
@@ -334,23 +359,25 @@ ability to dynamically change wallpapers through sockets")
         (base32 "07404h6w5934yimpwb0p9dxg1w3nv702bckm4m99jbjrda6jqhmi"))))
     (build-system cmake-build-system)
     (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
-                         pkg-config))
-    (inputs (list wayland
-                  wayland-protocols-next
-                  mesa
-                  cairo
-                  libdrm
-                  pango
-                  libxkbcommon
-                  hyprlang
-                  hyprutils
+                         pkg-config
+                         hyprwayland-scanner))
+    (inputs (list cairo
                   file
+                  libdrm
                   libglvnd
                   libjpeg-turbo
                   libwebp
+                  libxkbcommon
+                  mesa-opengl
+                  hyprlang
+                  hyprutils
+                  linux-pam
+                  pango
                   sdbus-c++-next
-                  linux-pam))
-    (arguments '(#:tests? #f)) ;; No tests
+                  wayland
+                  wayland-protocols-next))
+    (arguments (list #:tests? #f ;; No tests
+                     #:build-type "release"))
     (synopsis "GPU-accelerated screen locking utility")
     (description "Hyprland's multi-threaded and GPU-accelerated screen locking
 utility.")
diff --git a/sigils/packages/upstream.scm b/sigils/packages/upstream.scm
index caabe79..88aa2d0 100644
--- a/sigils/packages/upstream.scm
+++ b/sigils/packages/upstream.scm
@@ -32,7 +32,10 @@
   ;; sdbus
   #:use-module (gnu packages glib)
   ;; pyopengl
-  #:use-module (gnu packages gl))
+  #:use-module (gnu packages gl)
+  ;; udis86
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python))
 
 
 (define-public mimeo
diff --git a/sigils/packages/xorg.scm b/sigils/packages/xorg.scm
index 7d06853..35879e7 100644
--- a/sigils/packages/xorg.scm
+++ b/sigils/packages/xorg.scm
@@ -100,6 +100,7 @@
            python-numpy
            python-pyopengl              ; Drawing acceleration.
            python-pyopengl-accelerate   ; Same.
+           libglvnd
            python-paramiko              ; Tunneling over SSH.
            python-dbus                  ; For desktop notifications.
            dbus                         ; For dbus-launch command.