gnu: rust-libgit2-sys-0.10: Don't hide package.
* gnu/packages/crates-io.scm (rust-libgit2-sys-0.10)[arguments]: Add rust-libc-0.2, rust-libz-sys-1.0, rust-libssh2-sys-0.2, rust-openssl-sys-0.9, rust-cc-1.0, rust-pkg-config-0.3 to cargo-inputs. Add custom phase to unbundle vendored sources and set environment variables. [native-inputs]: Add libgit2, openssl, pkg-config, zlib. [properties]: Remove field.
This commit is contained in:
		
							parent
							
								
									c40e3d0bad
								
							
						
					
					
						commit
						0c85385450
					
				
					 1 changed files with 47 additions and 21 deletions
				
			
		| 
						 | 
					@ -25,7 +25,11 @@
 | 
				
			||||||
  #:use-module (guix build-system cargo)
 | 
					  #:use-module (guix build-system cargo)
 | 
				
			||||||
  #:use-module (guix download)
 | 
					  #:use-module (guix download)
 | 
				
			||||||
  #:use-module ((guix licenses) #:prefix license:)
 | 
					  #:use-module ((guix licenses) #:prefix license:)
 | 
				
			||||||
  #:use-module (guix packages))
 | 
					  #:use-module (guix packages)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages compression)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages pkg-config)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages tls)
 | 
				
			||||||
 | 
					  #:use-module (gnu packages version-control))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; Please: Try to add new module packages in alphabetic order.
 | 
					;;; Please: Try to add new module packages in alphabetic order.
 | 
				
			||||||
| 
						 | 
					@ -5567,28 +5571,46 @@ values of all the exported APIs match the platform that libc is compiled for.")
 | 
				
			||||||
         (base32
 | 
					         (base32
 | 
				
			||||||
          "0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r"))))
 | 
					          "0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r"))))
 | 
				
			||||||
    (build-system cargo-build-system)
 | 
					    (build-system cargo-build-system)
 | 
				
			||||||
    ;(arguments
 | 
					    (arguments
 | 
				
			||||||
    ; `(#:phases
 | 
					     `(#:cargo-inputs
 | 
				
			||||||
    ;  (modify-phases %standard-phases
 | 
					       (("rust-libc" ,rust-libc-0.2)
 | 
				
			||||||
    ;    (add-after 'unpack 'find-openssl
 | 
					        ("rust-libz-sys" ,rust-libz-sys-1.0)
 | 
				
			||||||
    ;      (lambda* (#:key inputs #:allow-other-keys)
 | 
					        ("rust-libssh2-sys" ,rust-libssh2-sys-0.2)
 | 
				
			||||||
    ;        (let ((openssl (assoc-ref inputs "openssl")))
 | 
					        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
 | 
				
			||||||
    ;          (setenv "OPENSSL_DIR" openssl))
 | 
					        ;; Build dependencies:
 | 
				
			||||||
    ;        (delete-file-recursively "libgit2")
 | 
					        ("rust-cc" ,rust-cc-1.0)
 | 
				
			||||||
    ;        (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
 | 
					        ("rust-pkg-config" ,rust-pkg-config-0.3))
 | 
				
			||||||
    ;        (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
 | 
					       #:phases
 | 
				
			||||||
    ;        #t)))))
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
    ;(native-inputs
 | 
					         (add-after 'configure 'dont-vendor-sources
 | 
				
			||||||
    ; `(("pkg-config" ,pkg-config)))
 | 
					           (lambda* (#:key inputs #:allow-other-keys)
 | 
				
			||||||
    ;(inputs
 | 
					             (let ((openssl (assoc-ref inputs "openssl")))
 | 
				
			||||||
    ; `(("libgit2" ,libgit2)
 | 
					               (setenv "OPENSSL_DIR" openssl))
 | 
				
			||||||
    ;   ("openssl" ,openssl)
 | 
					             (delete-file-recursively "libgit2")
 | 
				
			||||||
    ;   ("zlib" ,zlib)))
 | 
					             (delete-file-recursively
 | 
				
			||||||
 | 
					               (string-append "guix-vendor/rust-libgit2-sys-"
 | 
				
			||||||
 | 
					                              ,(package-version rust-libgit2-sys-0.10)
 | 
				
			||||||
 | 
					                              ".crate/libgit2"))
 | 
				
			||||||
 | 
					             (delete-file-recursively
 | 
				
			||||||
 | 
					               (string-append "guix-vendor/rust-libz-sys-"
 | 
				
			||||||
 | 
					                              ,(package-version rust-libz-sys-1.0)
 | 
				
			||||||
 | 
					                              ".crate/src/zlib"))
 | 
				
			||||||
 | 
					             (delete-file-recursively
 | 
				
			||||||
 | 
					               (string-append "guix-vendor/rust-libssh2-sys-"
 | 
				
			||||||
 | 
					                              ,(package-version rust-libssh2-sys-0.2)
 | 
				
			||||||
 | 
					                              ".crate/libssh2"))
 | 
				
			||||||
 | 
					             (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
 | 
				
			||||||
 | 
					             (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
 | 
				
			||||||
 | 
					             #t)))))
 | 
				
			||||||
 | 
					    (native-inputs
 | 
				
			||||||
 | 
					     `(("libgit2" ,libgit2)
 | 
				
			||||||
 | 
					       ("openssl" ,openssl)
 | 
				
			||||||
 | 
					       ("pkg-config" ,pkg-config)
 | 
				
			||||||
 | 
					       ("zlib" ,zlib)))
 | 
				
			||||||
    (home-page "https://github.com/rust-lang/git2-rs")
 | 
					    (home-page "https://github.com/rust-lang/git2-rs")
 | 
				
			||||||
    (synopsis "Native bindings to the libgit2 library")
 | 
					    (synopsis "Native bindings to the libgit2 library")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
     "This package provides native rust bindings to the @code{libgit2} library.")
 | 
					     "This package provides native rust bindings to the @code{libgit2} library.")
 | 
				
			||||||
    (properties '((hidden? . #t)))
 | 
					 | 
				
			||||||
    (license (list license:asl2.0
 | 
					    (license (list license:asl2.0
 | 
				
			||||||
                   license:expat))))
 | 
					                   license:expat))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5604,7 +5626,9 @@ values of all the exported APIs match the platform that libc is compiled for.")
 | 
				
			||||||
        (file-name (string-append name "-" version ".crate"))
 | 
					        (file-name (string-append name "-" version ".crate"))
 | 
				
			||||||
        (sha256
 | 
					        (sha256
 | 
				
			||||||
         (base32
 | 
					         (base32
 | 
				
			||||||
          "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc"))))))
 | 
					          "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc"))))
 | 
				
			||||||
 | 
					    (arguments '())
 | 
				
			||||||
 | 
					    (properties '((hidden? . #t)))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public rust-libgit2-sys-0.7
 | 
					(define-public rust-libgit2-sys-0.7
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
| 
						 | 
					@ -5618,7 +5642,9 @@ values of all the exported APIs match the platform that libc is compiled for.")
 | 
				
			||||||
        (file-name (string-append name "-" version ".crate"))
 | 
					        (file-name (string-append name "-" version ".crate"))
 | 
				
			||||||
        (sha256
 | 
					        (sha256
 | 
				
			||||||
         (base32
 | 
					         (base32
 | 
				
			||||||
          "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28"))))))
 | 
					          "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28"))))
 | 
				
			||||||
 | 
					    (arguments '())
 | 
				
			||||||
 | 
					    (properties '((hidden? . #t)))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public rust-libloading-0.5
 | 
					(define-public rust-libloading-0.5
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue