summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2021-03-15 14:34:08 +0200
committerEfraim Flashner <efraim@flashner.co.il>2021-03-15 15:53:15 +0200
commit770e326fdb006b2f689f55d5eb300d28ffd6a95b (patch)
tree32d6e0c1c2319c477d435b1bfba34552098d8b25 /gnu
parentf35ab79e033aa8e4955e9c9100c74ecbb3ce4d0b (diff)
downloadguix-770e326fdb006b2f689f55d5eb300d28ffd6a95b.tar.gz
gnu: rust-wayland-client-0.28: Adapt for new build system.
* gnu/packages/crates-graphics.scm (rust-wayland-client-0.28)
[arguments]: Don't skip build. Remove rust-wayland-commons-0.28,
rust-wayland-scanner-0.28, rust-wayland-sys-0.28 from cargo-inputs.
[inputs]: Add rust-bitflags-1, rust-downcast-rs-1, rust-libc-0.2,
rust-nix-0.18, rust-scoped-tls-1, rust-wayland-commons-0.28,
rust-wayland-scanner-0.28, rust-wayland-sys-0.28.
(rust-wayland-client-0.23): Adjust accordingly.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/crates-graphics.scm25
1 files changed, 17 insertions, 8 deletions
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 7dde00ffdb..65339c44de 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2324,16 +2324,23 @@ applications.")
         (base32 "1mxnflzv9s3qpcp0z7kqvrzki5bknfar9n9yky06f8ivs00vxgdx"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-downcast-rs" ,rust-downcast-rs-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-nix" ,rust-nix-0.18)
-        ("rust-scoped-tls" ,rust-scoped-tls-1)
-        ("rust-wayland-commons" ,rust-wayland-commons-0.28)
-        ("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
-        ("rust-wayland-sys" ,rust-wayland-sys-0.28))))
+        ("rust-scoped-tls" ,rust-scoped-tls-1))
+       #:cargo-development-inputs
+       (("rust-tempfile" ,rust-tempfile-3))))
+    (inputs
+     `(("rust-bitflags" ,rust-bitflags-1)
+       ("rust-downcast-rs" ,rust-downcast-rs-1)
+       ("rust-libc" ,rust-libc-0.2)
+       ("rust-nix" ,rust-nix-0.18)
+       ("rust-scoped-tls" ,rust-scoped-tls-1)
+       ("rust-wayland-commons" ,rust-wayland-commons-0.28)
+       ("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
+       ("rust-wayland-sys" ,rust-wayland-sys-0.28)))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis
      "Rust bindings to the standard C implementation of the wayland protocol")
@@ -2357,7 +2364,8 @@ the wayland protocol, client side.")
         (base32
          "1nmw2kz70llc5mxwzg6bglnqy0qnyr9224zjmq9czazgw3mq045g"))))
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-calloop" ,rust-calloop-0.4)
         ("rust-downcast-rs" ,rust-downcast-rs-1)
@@ -2369,7 +2377,8 @@ the wayland protocol, client side.")
         ("rust-wayland-scanner" ,rust-wayland-scanner-0.23))
        #:cargo-development-inputs
        (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-tempfile" ,rust-tempfile-3))))))
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (inputs `())))
 
 (define-public rust-wayland-client-0.21
   (package