summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-01-21 18:15:50 +0200
committerEfraim Flashner <efraim@flashner.co.il>2020-01-21 18:15:50 +0200
commit904e8a4697873ef459fd8ba40aafae82e2affcf1 (patch)
tree6195276e4ba7c7ae9a95d1455759f32a5d35b8f7
parent8bbf9d390fb3091249c89a585473fc4f00603bc1 (diff)
downloadguix-904e8a4697873ef459fd8ba40aafae82e2affcf1.tar.gz
gnu: rust-libz-sys-1.0: Don't hide package.
* gnu/packages/crates-io.scm (rust-libz-sys-1.0)[arguments]: Add
rust-libc-0.2, rust-cc-1.0, rust-pkg-config-0.3, rust-vcpkg-0.2 to
cargo-inputs. Add custom phase to delete vendored source.
[native-inputs]: Add pkg-config, zlib.
[properties]: Remove field.
-rw-r--r--gnu/packages/crates-io.scm31
1 files changed, 20 insertions, 11 deletions
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 163409c00d..e5c6b939dd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -6586,22 +6586,31 @@ types as proposed in RFC 1158.")
          (base32
           "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f"))))
     (build-system cargo-build-system)
-    ;(arguments
-    ; `(#:phases
-    ;   (modify-phases %standard-phases
-    ;     (add-after 'unpack 'delete-vendored-zlib
-    ;       (lambda _
-    ;         (delete-file-recursively "src/zlib")
-    ;         #t)))))
-    ;(inputs
-    ; `(("pkg-config" ,pkg-config)
-    ;   ("zlib" ,zlib)))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ;; Build dependencies:
+        ("rust-cc" ,rust-cc-1.0)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'delete-vendored-zlib
+           (lambda _
+             (delete-file-recursively "src/zlib")
+             (delete-file-recursively
+               (string-append "guix-vendor/rust-libz-sys-"
+                              ,(package-version rust-libz-sys-1.0)
+                              ".crate/src/zlib"))
+             #t)))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("zlib" ,zlib)))
     (home-page "https://github.com/rust-lang/libz-sys")
     (synopsis "Bindings to the system libz library")
     (description
      "This package provides bindings to the system @code{libz} library (also
 known as zlib).")
-    (properties '((hidden? . #t)))
     (license (list license:asl2.0
                    license:expat))))