From 904e8a4697873ef459fd8ba40aafae82e2affcf1 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 21 Jan 2020 18:15:50 +0200
Subject: 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.
---
 gnu/packages/crates-io.scm | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'gnu/packages')

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))))
 
-- 
cgit v1.2.3

r class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/doc/images?id=054ff198e446ae7b0a0dd183caf69368b8b9f580&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-03-14 16:30:19 +0100'>2019-03-14</span></td><td><a href='/guix/commit/doc/images?id=19008a22d18e772062952034c58a15ed341df3b5'>Merge branch 'staging' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-03-13 23:12:43 +0100'>2019-03-13</span></td><td><a href='/guix/commit/doc/images?id=e1c15e8b8e25e14c253ff1212e289565736f6ea7'>doc: Document the graphical installer some more.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-12-16 22:49:10 +0100'>2018-12-16</span></td><td><a href='/guix/commit/doc/images?id=b3bf38a5600d0fdcb0aeed29ee121edef632165d'>doc: Update mesboot graph without bootstrap-guile.</a><span class='msg-avail'>...</span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2018-11-24 08:18:31 +0100'>2018-11-24</span></td><td><a href='/guix/commit/doc/images?id=3d3daf7fa1794c64914ed53e51838a41d9b7adc4'>doc: Update for bootstrap-mescc-tools change.</a><span class='msg-avail'>...</span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2018-09-23 09:46:26 +0200'>2018-09-23</span></td><td><a href='/guix/commit/doc/images?id=a243722c5b8d50b4f0e3f9717ca71aa43dfc56a3'>doc: Describe the Reduced Binary Seed bootstrap.</a><span class='msg-avail'>...</span></td><td>Jan Nieuwenhuizen</td></tr>