Merge pull request #58625 from xzfc/aria2

aria2: Add sphinx build dependency to generate man pages
This commit is contained in:
Matthew Bauer 2019-04-11 01:03:43 -04:00 committed by GitHub
commit 28d83343a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View file

@ -1,6 +1,6 @@
{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook
, openssl, c-ares, libxml2, sqlite, zlib, libssh2
, cppunit
, cppunit, sphinx
, Security
}:
@ -23,13 +23,17 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ];
buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++
stdenv.lib.optional stdenv.isDarwin Security;
configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
prePatch = ''
patchShebangs doc/manual-src/en/mkapiref.py
'';
checkInputs = [ cppunit ];
doCheck = false; # needs the net

View file

@ -862,6 +862,7 @@ in
aria2 = callPackage ../tools/networking/aria2 {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (pythonPackages) sphinx;
};
aria = aria2;