diff options
| author | Evgenii Lepikhin <e.lepikhin@corp.mail.ru> | 2021-05-29 23:56:59 +0300 |
|---|---|---|
| committer | Evgenii Lepikhin <e.lepikhin@corp.mail.ru> | 2021-05-29 23:57:42 +0300 |
| commit | 663d2f4bf7abb33ec9e053e16b12ed2ef4eb2498 (patch) | |
| tree | 9014bfcb76b6d3df94d1886f91140ec36e4cf0ec | |
| parent | feat: Added 1Password CLI (diff) | |
| download | johnlepikhin-guix-channel-663d2f4bf7abb33ec9e053e16b12ed2ef4eb2498.tar.gz | |
refactor: Reindented, removed unused imports
| -rw-r--r-- | johnlepikhin/packages/one-password.scm | 5 | ||||
| -rw-r--r-- | johnlepikhin/packages/rust-nightly.scm | 19 |
2 files changed, 14 insertions, 10 deletions
diff --git a/johnlepikhin/packages/one-password.scm b/johnlepikhin/packages/one-password.scm index aa3f102..7c2cb19 100644 --- a/johnlepikhin/packages/one-password.scm +++ b/johnlepikhin/packages/one-password.scm @@ -3,15 +3,10 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) - #:use-module (gnu packages gcc) #:use-module (gnu packages base) #:use-module (gnu packages elf) #:use-module (gnu packages bootstrap) #:use-module (gnu packages compression) - #:use-module (gnu packages xorg) - #:use-module (gnu packages gnupg) - #:use-module (gnu packages fontutils) - #:use-module (ice-9 match) #:use-module (guix monads) #:use-module (guix store) #:use-module (guix gexp) diff --git a/johnlepikhin/packages/rust-nightly.scm b/johnlepikhin/packages/rust-nightly.scm index e8b7528..d0ddb35 100644 --- a/johnlepikhin/packages/rust-nightly.scm +++ b/johnlepikhin/packages/rust-nightly.scm @@ -20,7 +20,10 @@ (version (string-append "nightly-" timestamp)) (source (origin (method url-fetch) - (uri (string-append "https://static.rust-lang.org/dist/" timestamp "/rust-nightly-x86_64-unknown-linux-gnu.tar.xz")) + (uri (string-append + "https://static.rust-lang.org/dist/" + timestamp + "/rust-nightly-x86_64-unknown-linux-gnu.tar.xz")) (sha256 (base32 checksum)))) (build-system copy-build-system) (supported-systems '("x86_64-linux")) @@ -48,7 +51,12 @@ out "/lib/*.so " out "/lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so")) (dynamic-linker (string-append (assoc-ref inputs "libc") ,(glibc-dynamic-linker)))) - (system (string-append patchelf " --set-rpath \"$LIBRARY_PATH:" out "/lib\" --set-interpreter " dynamic-linker " " bin-masks)) + (system (string-append + patchelf + " --set-rpath \"$LIBRARY_PATH:" + out + "/lib\" --set-interpreter " + dynamic-linker " " bin-masks)) (system (string-append patchelf " --set-rpath \"$LIBRARY_PATH:" out "/lib\" " lib-masks)) #t)))) #:install-plan @@ -62,13 +70,14 @@ ("rust-analyzer-preview/bin/rust-analyzer" "bin/") ("cargo/bin/cargo" "bin/") ("rustc/lib" "lib") - ("rust-std-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib" "lib/rustlib/x86_64-unknown-linux-gnu/lib")))) - (native-inputs `(("patchelf" ,patchelf))) + ("rust-std-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib" + "lib/rustlib/x86_64-unknown-linux-gnu/lib")))) + (native-inputs `(("patchelf" ,patchelf) + ("cmake" ,cmake))) (inputs `(("libstdc++" ,(make-libstdc++ gcc)) ("gcc:lib" ,(canonical-package gcc) "lib") ("glibc" ,glibc) - ("cmake" ,cmake) ("zlib" ,zlib))) (synopsis "Compiler for the Rust programming language") (description "Rust is a systems programming language that provides memory safety and thread safety guarantees.") |
