diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/ndn-cxx | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ndn-cxx')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix index d461535ecef0..893f82a6d526 100644 --- a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix @@ -1,24 +1,36 @@ -{ stdenv, fetchFromGitHub, openssl, doxygen -, boost, sqlite, pkgconfig, python, pythonPackages, wafHook }: -let - version = "0.6.3"; -in -stdenv.mkDerivation { +{ stdenv +, fetchFromGitHub +, doxygen +, pkg-config +, python3 +, python3Packages +, wafHook +, boost +, openssl +, sqlite +}: + +stdenv.mkDerivation rec { pname = "ndn-cxx"; - inherit version; + version = "0.7.1"; + src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; - rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00"; - sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h"; + rev = "${pname}-${version}"; + sha256 = "1lcaqc79n3d9sip7knddblba17sz18b0w7nlxmj3fz3lb3z9qd51"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx]; + + nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; + + buildInputs = [ boost openssl sqlite ]; + wafConfigureFlags = [ "--with-openssl=${openssl.dev}" "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" ]; + meta = with stdenv.lib; { homepage = "http://named-data.net/"; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; @@ -36,7 +48,7 @@ stdenv.mkDerivation { and consuming less resources overall. ''; license = licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ maintainers.sjmackenzie ]; + platforms = platforms.unix; + maintainers = with maintainers; [ sjmackenzie ]; }; } |