2 files changed, 103 insertions(+), 7 deletions(-)

M gnu/packages/freedesktop.scm
M gnu/packages/rust-crates.scm

@@ 41,6 41,7 @@
 ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024, 2025 dan <i@dan.games>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2025 wvlab <me@wvlab.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ 65,6 66,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (guix build-system cargo)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)


@@ 112,6 114,7 @@
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages image)
   #:use-module (gnu packages language)
+  #:use-module (gnu packages llvm)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libunwind)
   #:use-module (gnu packages libusb)


@@ 133,6 136,9 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages rdesktop)
   #:use-module (gnu packages rsync)
+  #:use-module (gnu packages rust)
+  #:use-module (gnu packages rust-apps)
+  #:use-module (gnu packages rust-crates)
   #:use-module (gnu packages samba)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)


@@ 140,6 146,7 @@
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages video)
   #:use-module (gnu packages virtualization)
+  #:use-module (gnu packages vulkan)
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages web)
   #:use-module (gnu packages wm)


@@ 3420,7 3427,7 @@ notifies the user using any notification daemon implementing
 (define-public waypipe
   (package
     (name "waypipe")
-    (version "0.9.1")
+    (version "0.10.5")
     (source
      (origin
        (method git-fetch)


@@ 3429,17 3436,60 @@ notifies the user using any notification daemon implementing
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0pj7l3ix0pp0sfqxfa2hxql0f30vz6hh01fq5kzhs831b632i3z0"))))
+        (base32 "1rg9qzsi07b65cdf421895dfy4gkb1kwmkwn3sfx6n7sfr8b1z6a"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 ;; Fix the cargo flags:
+                 (substitute* '("compile_wrapper.sh"
+                                "meson.build")
+                   (("--frozen") "--offline"))))))
     (build-system meson-build-system)
     (native-inputs
-     (list pkg-config scdoc
+     (list pkg-config
+           scdoc
+           rust
+           (list rust "cargo")
+           rust-bindgen-cli
+           shaderc
+           clang ; bindgen does not work without it
+           vulkan-headers
            ;; For tests
            python))
-    (inputs (list lz4 libva mesa libdrm ffmpeg))
+    (inputs
+     (cons* ffmpeg
+            lz4
+            libdrm
+            libva
+            mesa
+            vulkan-loader
+            (list zstd "lib")
+            (cargo-inputs 'waypipe)))
     (arguments
-     (list #:configure-flags
-           #~(list "-Dwith_lz4=enabled" "-Dwith_vaapi=enabled"
-                   "-Dwith_dmabuf=enabled" "-Dwith_video=enabled")))
+     (list
+       #:imported-modules
+       (append %cargo-build-system-modules
+               %meson-build-system-modules)
+       #:modules
+       '(((guix build cargo-build-system) #:prefix cargo:)
+         (guix build meson-build-system)
+         (guix build utils))
+       #:phases
+       #~(modify-phases %standard-phases
+           (add-after 'unpack 'prepare-cargo-build-system
+             (lambda args
+               (for-each
+                 (lambda (phase)
+                   (apply (assoc-ref cargo:%standard-phases phase)
+                          #:cargo-target #$(cargo-triplet) args))
+                   '(unpack-rust-crates
+                     configure
+                     check-for-pregenerated-files
+                     patch-cargo-checksums)))))
+       #:configure-flags
+       #~(list "-Dwith_lz4=enabled"
+               "-Dwith_vaapi=enabled"
+               "-Dwith_dmabuf=enabled"
+               "-Dwith_video=enabled")))
     (home-page "https://gitlab.freedesktop.org/mstoeckl/waypipe")
     (synopsis "Proxy for Wayland protocol applications")
     (description

@@ 2717,6 2717,10 @@
   (crate-source "clap" "4.5.50"
                 "08qna2mzl9irqp0p3lbbn06pjiym0dsgwbz3lkd7s0d6z1xzsb0c"))
 
+(define rust-clap-4.5.51
+  (crate-source "clap" "4.5.51"
+                "1xg5fa4lcl2pmdhlns1qzw5dpz1yz6hxk6x6j7qra0hf2whxf9jc"))
+
 (define rust-clap-builder-4.3.21
   (crate-source "clap_builder" "4.3.21"
                 "1am4bavjhp26pv0ymsprmdqdw44sxdi8abi03ywaj0czbsmz3a88"))


@@ 2781,6 2785,10 @@
   (crate-source "clap_builder" "4.5.50"
                 "1867h9y6fxbh35bv3f45m40grmm7ddxsv07hgqxcsp0cx2whak0a"))
 
+(define rust-clap-builder-4.5.51
+  (crate-source "clap_builder" "4.5.51"
+                "06h10byk8dl8b4nypil6aad9kshgfrjyji5ybb8bz0gngc65z0vm"))
+
 (define rust-clap-cargo-0.15.2
   (crate-source "clap-cargo" "0.15.2"
                 "1rai72khjaj16b5751b8kjipnxl54bj4pdg93kda9gzj9zlg0inm"))


@@ 57008,6 57016,44 @@
                                       rust-zvariant-5.5.3
                                       rust-zvariant-derive-5.5.3
                                       rust-zvariant-utils-3.2.0))
+                     (waypipe =>
+                              (list rust-anstream-0.6.21
+                                    rust-anstyle-1.0.13
+                                    rust-anstyle-parse-0.2.7
+                                    rust-anstyle-query-1.1.4
+                                    rust-anstyle-wincon-3.0.10
+                                    rust-ash-0.38.0+1.3.281
+                                    rust-autocfg-1.5.0
+                                    rust-bitflags-2.10.0
+                                    rust-cfg-if-1.0.4
+                                    rust-cfg-aliases-0.2.1
+                                    rust-clap-4.5.51
+                                    rust-clap-builder-4.5.51
+                                    rust-clap-lex-0.7.6
+                                    rust-colorchoice-1.0.4
+                                    rust-getrandom-0.2.16
+                                    rust-is-terminal-polyfill-1.70.2
+                                    rust-libc-0.2.177
+                                    rust-libloading-0.8.9
+                                    rust-log-0.4.28
+                                    rust-memoffset-0.9.1
+                                    rust-nix-0.29.0
+                                    rust-once-cell-polyfill-1.70.2
+                                    rust-pkg-config-0.3.32
+                                    rust-strsim-0.11.1
+                                    rust-utf8parse-0.2.2
+                                    rust-wasi-0.11.1+wasi-snapshot-preview1
+                                    rust-windows-link-0.2.1
+                                    rust-windows-sys-0.60.2
+                                    rust-windows-targets-0.53.5
+                                    rust-windows-aarch64-gnullvm-0.53.1
+                                    rust-windows-aarch64-msvc-0.53.1
+                                    rust-windows-i686-gnu-0.53.1
+                                    rust-windows-i686-gnullvm-0.53.1
+                                    rust-windows-i686-msvc-0.53.1
+                                    rust-windows-x86-64-gnu-0.53.1
+                                    rust-windows-x86-64-gnullvm-0.53.1
+                                    rust-windows-x86-64-msvc-0.53.1))
                      (wlgreet =>
                               (list rust-ab-glyph-rasterizer-0.1.8
                                     rust-android-tzdata-0.1.1