summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-01-21 17:44:06 +0200
committerEfraim Flashner <efraim@flashner.co.il>2020-01-21 17:44:37 +0200
commit328df292aa45226b9a53a7bf6d23f4f4d707a3ad (patch)
tree85292a9e08d952d80d9942e0c80c846d7f08e3dd /gnu/packages
parentaf996d9086d875d0f06acbecf5176ffb94f8e015 (diff)
downloadguix-328df292aa45226b9a53a7bf6d23f4f4d707a3ad.tar.gz
gnu: rust-lzma-sys-0.1: Don't hide package.
* gnu/packages/crates-io.scm (rust-lzma-sys-0.1)[arguments]: Add
rust-libc-0.2, rust-cc-1.0, rust-pkg-config-0.3 to cargo-inputs. Add
custom phase to delete vendored code.
[native-inputs]: Add pkg-config, xz.
[properties]: Remove field.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/crates-io.scm30
1 files changed, 18 insertions, 12 deletions
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 57319c73f8..4f1505e6fc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5898,23 +5898,29 @@ functions and static variables these libraries contain.")
          (base32
           "14gyj256yh0wm77jbvmlc39v7lfn0navpfrja4alczarzlc8ir2k"))))
     (build-system cargo-build-system)
-    ;(arguments
-    ; `(#:phases
-    ;   (modify-phases %standard-phases
-    ;     (add-after 'unpack 'unbundle-xz
-    ;       (lambda* (#:key inputs #:allow-other-keys)
-    ;         (let ((xz (assoc-ref inputs "xz")))
-    ;           (delete-file-recursively "xz-5.2"))
-    ;         #t)))))
-    ;(inputs
-    ; `(("pkg-config" ,pkg-config)
-    ;   ("xz" ,xz)))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-cc" ,rust-cc-1.0)
+        ("rust-pkg-config" ,rust-pkg-config-0.3))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'unbundle-xz
+           (lambda _
+             (delete-file-recursively "xz-5.2")
+             (delete-file-recursively
+               (string-append "guix-vendor/rust-lzma-sys-"
+                              ,(package-version rust-lzma-sys-0.1)
+                              ".crate/xz-5.2"))
+             #t)))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("xz" ,xz)))
     (home-page "https://github.com/alexcrichton/xz2-rs")
     (synopsis "Bindings to liblzma for lzma and xz stream encoding/decoding")
     (description
      "This package contains the raw bindings to liblzma which contains an
 implementation of LZMA and xz stream encoding/decoding.")
-    (properties '((hidden? . #t)))
     (license (list license:asl2.0
                    license:expat))))