guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/08: gnu: rust-jemalloc-sys-0.3: Remove vendored code.


From: guix-commits
Subject: 03/08: gnu: rust-jemalloc-sys-0.3: Remove vendored code.
Date: Mon, 27 Jan 2020 12:47:26 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit e2302953d55f598e6c2d9224e3377d7116e31608
Author: Efraim Flashner <address@hidden>
AuthorDate: Sat Jan 25 21:44:18 2020 +0200

    gnu: rust-jemalloc-sys-0.3: Remove vendored code.
    
    * gnu/packages/crates-io.scm (rust-jemalloc-sys-0.3)[source]: Remove
    vendored code.
    [arguments]: Don't remove missing vendored code.
---
 gnu/packages/crates-io.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8226768..ea4a3f3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5328,10 +5328,13 @@ wasm-bindgen crate.")
       (origin
         (method url-fetch)
         (uri (crate-uri "jemalloc-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0ify9vlql01qhfxlj7d4p9jvcp90mj2h69nkbq7slccvbhzryfqd"))))
+          "0ify9vlql01qhfxlj7d4p9jvcp90mj2h69nkbq7slccvbhzryfqd"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin (delete-file-recursively "jemalloc") #t))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -5344,11 +5347,6 @@ wasm-bindgen crate.")
          (add-after 'configure 'override-jemalloc
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((jemalloc (assoc-ref inputs "jemalloc")))
-               (delete-file-recursively "jemalloc")
-               (delete-file-recursively
-                 (string-append "guix-vendor/rust-jemalloc-sys-"
-                                ,(package-version rust-jemalloc-sys-0.3)
-                                ".crate/jemalloc"))
                (setenv "JEMALLOC_OVERRIDE"
                        (string-append jemalloc "/lib/libjemalloc_pic.a")))
              #t)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]