public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73948 from edef1c/git-series-libssh2 

git-series: use nixpkgs libssh2
This commit is contained in:
edef 2019-11-23 19:24:07 +00:00 committed by GitHub
parent 42eeca722c 476d1bec07
commit 3dd8e8e7fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/git-series/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2 }: { stdenv, fetchFromGitHub, fetchpatch, rustPlatform
, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2, libssh2
}:
with rustPlatform; with rustPlatform;
@ -28,8 +30,9 @@ buildRustPackage rec {
]; ];
LIBGIT2_SYS_USE_PKG_CONFIG = true; LIBGIT2_SYS_USE_PKG_CONFIG = true;
LIBSSH2_SYS_USE_PKG_CONFIG = true;
nativeBuildInputs = [ cmake pkgconfig perl ]; nativeBuildInputs = [ cmake pkgconfig perl ];
buildInputs = [ openssl zlib curl libgit2 ]; buildInputs = [ openssl zlib curl libgit2 libssh2 ];
postBuild = '' postBuild = ''
install -D "$src/git-series.1" "$out/man/man1/git-series.1" install -D "$src/git-series.1" "$out/man/man1/git-series.1"