summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2021-03-15 14:38:36 +0200
committerEfraim Flashner <efraim@flashner.co.il>2021-03-15 15:53:16 +0200
commitfacf27e08b1be5a8ab390b4998dd3589fc71e540 (patch)
tree6db91ae732b51fa2b0142ba46e158d48fe6bc18c
parentbb06a747b2884c00a8c125cb499c7c13dcddf46e (diff)
downloadguix-facf27e08b1be5a8ab390b4998dd3589fc71e540.tar.gz
gnu: rust-wayland-protocols-0.28: Adapt for new build system.
* gnu/packages/crates-graphics.scm (rust-wayland-protocols-0.28)
[arguments]: Don't skip build. Remove everything from cargo-inputs
except rust-bitflags-1.
[inputs]: Add rust-bitflags-1, rust-wayland-client-0.28,
rust-wayland-commons-0.28, rust-wayland-scanner-0.28,
rust-wayland-server-0.28.
(rust-wayland-protocols-0.23): Adjust accordingly.
-rw-r--r--gnu/packages/crates-graphics.scm21
1 files changed, 12 insertions, 9 deletions
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 76a4cc96e3..dfc85de4de 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2546,13 +2546,14 @@ initializing an OpenGL or Vulkan context.")
         (base32 "0c0sw13qssrvf3jgygwqpiimpaagz3haxn9jridd4k85sfs856ii"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-wayland-client" ,rust-wayland-client-0.28)
-        ("rust-wayland-commons" ,rust-wayland-commons-0.28)
-        ("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
-        ("rust-wayland-server" ,rust-wayland-server-0.28))))
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1))))
+    (inputs
+     `(("rust-bitflags" ,rust-bitflags-1)
+       ("rust-wayland-client" ,rust-wayland-client-0.28)
+       ("rust-wayland-commons" ,rust-wayland-commons-0.28)
+       ("rust-wayland-scanner" ,rust-wayland-scanner-0.28)
+       ("rust-wayland-server" ,rust-wayland-server-0.28)))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis "Generated API for the officials Wayland protocol extensions")
     (description
@@ -2575,12 +2576,14 @@ extensions.")
         (base32
          "1ygwbzqlnks5xzafka3c8ag6k92g2h6ygj2xsmvjfx2n6rj8dhkc"))))
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-wayland-client" ,rust-wayland-client-0.23)
         ("rust-wayland-commons" ,rust-wayland-commons-0.23)
         ("rust-wayland-server" ,rust-wayland-server-0.23)
-        ("rust-wayland-scanner" ,rust-wayland-scanner-0.23))))))
+        ("rust-wayland-scanner" ,rust-wayland-scanner-0.23))))
+    (inputs `())))
 
 (define-public rust-wayland-protocols-0.21
   (package