diff options
author | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
commit | a485a98ca8296d760251e9d870583117ac50979e (patch) | |
tree | 792df6983c0e52403a6c3b82c804f295369a9b1d /gnu/packages/crates-graphics.scm | |
parent | 84d1b500f078b619daba35864c703890bd91e5c2 (diff) | |
parent | 1ca0c348674dd4dec2ccb5a2d79b4cfd03a631ef (diff) | |
download | guix-patches-a485a98ca8296d760251e9d870583117ac50979e.tar guix-patches-a485a98ca8296d760251e9d870583117ac50979e.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/crates-graphics.scm')
-rw-r--r-- | gnu/packages/crates-graphics.scm | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 9193479092..11bdd4c4f4 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -183,20 +183,12 @@ text or blue underlined text, on ANSI terminals.") (arguments `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.53) - ("rust-metadeps" ,rust-metadeps-1.1)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-environmental-variable - (lambda* (#:key inputs #:allow-other-keys) - (let ((clang (assoc-ref inputs "libclang"))) - (setenv "LIBCLANG_PATH" - (string-append clang "/lib"))) - #t))))) + ("rust-metadeps" ,rust-metadeps-1.1)))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libaom" ,libaom) - ("libclang" ,clang) + ("clang" ,clang) ("llvm" ,llvm))) (home-page "https://github.com/rust-av/aom-rs") (synopsis "FFI bindings to aom") @@ -402,19 +394,12 @@ for computer graphics.") (arguments `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.54) - ("rust-metadeps" ,rust-metadeps-1.1)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-environmental-variable - (lambda* (#:key inputs #:allow-other-keys) - (let ((clang (assoc-ref inputs "libclang"))) - (setenv "LIBCLANG_PATH" - (string-append clang "/lib"))) - #t))))) + ("rust-metadeps" ,rust-metadeps-1.1)))) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("dav1d" ,dav1d) - ("pkg-config" ,pkg-config) - ("libclang" ,clang) + ("clang" ,clang) ("llvm" ,llvm))) (home-page "https://github.com/rust-av/dav1d-rs") (synopsis "FFI bindings to dav1d") |