diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/crates-graphics.scm | |
parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
download | guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/crates-graphics.scm')
-rw-r--r-- | gnu/packages/crates-graphics.scm | 49 |
1 files changed, 38 insertions, 11 deletions
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 11bdd4c4f4..02bf7b27a4 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -8,6 +8,8 @@ ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Leo Famulari <leo@famulari.name> +;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -166,8 +168,38 @@ text or blue underlined text, on ANSI terminals.") "1xif1bh938qpfc3d0f9xgidibpm65xix11w9gszwqnia00q7rb13")))) (arguments `()))) +(define-public rust-aom-sys-0.2 + (package + (name "rust-aom-sys") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "aom-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03a0xhaafjn0hlpcf9ba73hv557m0jqnmj9wl57wzrcnka96zvgj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bindgen" ,rust-bindgen-0.54) + ("rust-metadeps" ,rust-metadeps-1.1)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libaom" ,libaom) + ("clang" ,clang) + ("llvm" ,llvm))) + (home-page "https://github.com/rust-av/aom-rs") + (synopsis "FFI bindings to aom") + (description "This package provides FFI bindings to aom.") + (license license:expat))) + (define-public rust-aom-sys-0.1 (package + (inherit rust-aom-sys-0.2) (name "rust-aom-sys") (version "0.1.4") (source @@ -189,11 +221,7 @@ text or blue underlined text, on ANSI terminals.") (inputs `(("libaom" ,libaom) ("clang" ,clang) - ("llvm" ,llvm))) - (home-page "https://github.com/rust-av/aom-rs") - (synopsis "FFI bindings to aom") - (description "This package provides FFI bindings to aom.") - (license license:expat))) + ("llvm" ,llvm))))) (define-public rust-ascii-canvas-2 (package @@ -2268,7 +2296,7 @@ protocol extensions. Look at the crate wayland-client for usable bindings.") (define-public rust-x11-2 (package (name "rust-x11") - (version "2.18.1") + (version "2.18.2") (source (origin (method url-fetch) @@ -2276,17 +2304,16 @@ protocol extensions. Look at the crate wayland-client for usable bindings.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0dg2d0yrqmwg6prpxkw3vpmwzwxnaki2cn0v64ylh5gp4cqpws9r")))) + (base32 "0wz7l6dlbraa9zalh9i45v9wibvkir9m2m1sg0jnzcbcaj9d1v3p")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3)))) - (home-page "https://github.com/erlepereira/x11-rs.git") + (home-page "https://github.com/erlepereira/x11-rs") (synopsis "X11 library bindings for Rust") - (description "X11 library bindings for Rust.") - (license license:cc0))) + (description "This crate provides X11 library bindings for Rust.") + (license license:expat))) (define-public rust-x11-clipboard-0.4 (package |