aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-07-27 13:40:55 +0200
committerMarius Bakke <marius@gnu.org>2022-07-27 16:13:36 +0200
commitb6242d29f499cf8547783cad4af1cee0fe0bfce6 (patch)
treeff1a4b609db27522f3bf94dfd7461c2f30002a05 /gnu/packages
parent8aef4c5071968d8f5e91c9241a1a83847ac5374b (diff)
downloadguix-b6242d29f499cf8547783cad4af1cee0fe0bfce6.tar.gz
guix-b6242d29f499cf8547783cad4af1cee0fe0bfce6.zip
gnu: rust-wayland-sys: Add 0.29.
* gnu/packages/crates-graphics.scm (rust-wayland-sys-0.29): New variable. (rust-wayland-sys-0.28): Inherit from it.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/crates-graphics.scm51
1 files changed, 43 insertions, 8 deletions
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index da61607266..616a0bf6f7 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2864,35 +2864,36 @@ the wayland protocol, server side.")
("rust-wayland-sys" ,rust-wayland-sys-0.21)
("rust-wayland-scanner" ,rust-wayland-scanner-0.21))))))
-(define-public rust-wayland-sys-0.28
+(define-public rust-wayland-sys-0.29
(package
(name "rust-wayland-sys")
- (version "0.28.3")
+ (version "0.29.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "wayland-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "16f03jsy7q6p2wpaazc4w4kycyyk0fz7lacpdbcizl9m1i7874v7"))))
+ (base32 "1m2jwk5q36jidwbdmdicmi27r9dzi4wanzg3i28nfxc9kbvisd6r"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-dlib" ,rust-dlib-0.4)
+ (("rust-dlib" ,rust-dlib-0.5)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
+ ("rust-memoffset" ,rust-memoffset-0.6)
("rust-pkg-config" ,rust-pkg-config-0.3))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-libraries
(lambda* (#:key inputs #:allow-other-keys)
- (let ((libwayland (assoc-ref inputs "wayland")))
+ (let ((libwayland (dirname (search-input-file
+ inputs "lib/libwayland-client.so"))))
(substitute* (find-files "src" "\\.rs$")
(("libwayland.*\\.so" shared-lib)
- (string-append libwayland "/lib/" shared-lib)))
- #t))))))
+ (string-append libwayland "/" shared-lib)))))))))
(inputs
- (list rust-dlib-0.4 rust-lazy-static-1 rust-libc-0.2
+ (list rust-dlib-0.5 rust-lazy-static-1 rust-libc-0.2
rust-pkg-config-0.3))
(propagated-inputs
(list wayland))
@@ -2905,6 +2906,40 @@ you are working on custom Wayland protocol extensions. Look at the
crate @code{rust-wayland-client} for usable bindings.")
(license license:expat)))
+(define-public rust-wayland-sys-0.28
+ (package
+ (inherit rust-wayland-sys-0.29)
+ (name "rust-wayland-sys")
+ (version "0.28.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "wayland-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "16f03jsy7q6p2wpaazc4w4kycyyk0fz7lacpdbcizl9m1i7874v7"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-dlib" ,rust-dlib-0.4)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-pkg-config" ,rust-pkg-config-0.3))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-libraries
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libwayland (assoc-ref inputs "wayland")))
+ (substitute* (find-files "src" "\\.rs$")
+ (("libwayland.*\\.so" shared-lib)
+ (string-append libwayland "/lib/" shared-lib)))
+ #t))))))
+ (inputs
+ (list rust-dlib-0.4 rust-lazy-static-1 rust-libc-0.2
+ rust-pkg-config-0.3))
+ (propagated-inputs
+ (list wayland))))
+
(define-public rust-wayland-sys-0.23
(package
(inherit rust-wayland-sys-0.28)