diff options
| author | Filippo Berto <berto.f@protonmail.com> | 2021-12-30 15:49:41 +0100 |
|---|---|---|
| committer | Filippo Berto <berto.f@protonmail.com> | 2021-12-30 15:52:45 +0100 |
| commit | 3aee8d70cca7e1e2970c783f63d218ede88dd12a (patch) | |
| tree | 30bb4f84ab8a437020fb53557bb8a7463a182e36 /pkgs/tools/networking/ndn-tools | |
| parent | 96dae085537e87d2d08551fced6bd404b6c2864b (diff) | |
NDN: fix builds after boost upgrade
- updated derivations with the correct boost version - prepared check phases for unit tests. Some of them don't work on upstream and have already been reported years ago - checked that the produced software works as expected
Diffstat (limited to 'pkgs/tools/networking/ndn-tools')
| -rw-r--r-- | pkgs/tools/networking/ndn-tools/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 83a8182b42751..1b693f21f62eb 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost +, boost175 , fetchFromGitHub , libpcap , ndn-cxx @@ -18,21 +18,23 @@ stdenv.mkDerivation rec { owner = "named-data"; repo = pname; rev = "ndn-tools-${version}"; - sha256 = "1q2d0v8srqjbvigr570qw6ia0d9f88aj26ccyxkzjjwwqdx3y4fy"; + sha256 = "sha256-3hE/esOcS/ln94wZIRVCLjWgouEYnJJf3EvirNEGTeA="; }; nativeBuildInputs = [ pkg-config sphinx wafHook ]; buildInputs = [ libpcap ndn-cxx openssl ]; wafConfigureFlags = [ - "--boost-includes=${boost.dev}/include" - "--boost-libs=${boost.out}/lib" - "--with-tests" + "--boost-includes=${boost175.dev}/include" + "--boost-libs=${boost175.out}/lib" + # "--with-tests" ]; - doCheck = true; + doCheck = false; checkPhase = '' + runHook preCheck build/unit-tests + runHook postCheck ''; meta = with lib; { |