diff options
| author | Austin Seipp <aseipp@pobox.com> | 2018-08-30 17:10:39 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-09-03 03:23:32 -0500 |
| commit | 185f0015f230a26bbd1fdea156e5ea6fbb2f288a (patch) | |
| tree | 8b26d4168a13fa3795fcaeea90b3f1043dc8a7a5 | |
| parent | d1c6c32230f29c3136f4a30e2c7ac36f3b000e4b (diff) | |
| download | nixpkgs-185f0015f230a26bbd1fdea156e5ea6fbb2f288a.tar nixpkgs-185f0015f230a26bbd1fdea156e5ea6fbb2f288a.tar.gz nixpkgs-185f0015f230a26bbd1fdea156e5ea6fbb2f288a.tar.bz2 nixpkgs-185f0015f230a26bbd1fdea156e5ea6fbb2f288a.tar.lz nixpkgs-185f0015f230a26bbd1fdea156e5ea6fbb2f288a.tar.xz nixpkgs-185f0015f230a26bbd1fdea156e5ea6fbb2f288a.tar.zst nixpkgs-185f0015f230a26bbd1fdea156e5ea6fbb2f288a.zip | |
opendht: rework module to use autoreconfHook, and use multiple outputs
Signed-off-by: Austin Seipp <aseipp@pobox.com>
| -rw-r--r-- | pkgs/development/libraries/opendht/default.nix | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index bd7d252e1a0..49d70bc211a 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -1,14 +1,6 @@ -{ stdenv -, fetchFromGitHub -, autoconf -, automake -, libtool -, pkgconfig -, nettle -, gnutls -, msgpack -, readline -, libargon2 +{ stdenv, fetchFromGitHub +, autoreconfHook, pkgconfig +, nettle, gnutls, msgpack, readline, libargon2 }: stdenv.mkDerivation rec { @@ -22,27 +14,26 @@ stdenv.mkDerivation rec { sha256 = "1wqib5plak9bw2bla7y4qyjqi0b00kf8mfwlml16qj3i0aq6h2cp"; }; - buildInputs = [ - autoconf - automake - libtool - pkgconfig - nettle - gnutls - msgpack - readline - libargon2 - ]; + nativeBuildInputs = + [ autoreconfHook + pkgconfig + ]; - preConfigure = '' - ./autogen.sh - ''; + buildInputs = + [ nettle + gnutls + msgpack + readline + libargon2 + ]; + + outputs = [ "out" "lib" "dev" "man" ]; meta = with stdenv.lib; { description = "A C++11 Kademlia distributed hash table implementation"; - homepage = https://github.com/savoirfairelinux/opendht; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ taeer olynch ]; - platforms = platforms.linux; + homepage = https://github.com/savoirfairelinux/opendht; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ taeer olynch thoughtpolice ]; + platforms = platforms.linux; }; } |