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

ndn-cxx: fixed broken build and updated to latest release (#48706)

Browse Source
This commit is contained in:
Stewart Mackenzie 2018-10-21 03:16:26 +08:00 committed by Joachim Schiele
parent 0c7934017b
commit d0b9f95ac8
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/ndn-cxx/default.nix
View File

@ -1,24 +1,24 @@
{ stdenv, fetchgit, openssl, doxygen, boost, sqlite, cryptopp, pkgconfig, python, pythonPackages }: { stdenv, fetchFromGitHub, openssl, doxygen, boost, sqlite, pkgconfig, python, pythonPackages }:
let let
version = "4c32e7"; version = "0.6.3";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ndn-cxx-0.1-${version}"; name = "ndn-cxx-${version}";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/named-data/ndn-cxx.git"; owner = "named-data";
rev = "4c32e748863d5165cc0e3d6b54a8383f4836cdf1"; repo = "ndn-cxx";
sha256 = "18szs3j3ig8wlcqngran0daxaj7j2qsmch0212ids6fymj1hgax4"; rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00";
sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl doxygen boost sqlite cryptopp python pythonPackages.sphinx]; buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx];
preConfigure = '' preConfigure = ''
patchShebangs waf patchShebangs waf
./waf configure \ ./waf configure \
--with-cryptopp=${cryptopp} \ --prefix=$out \
--with-openssl=${openssl.dev} \
--boost-includes=${boost.dev}/include \ --boost-includes=${boost.dev}/include \
--boost-libs=${boost.out}/lib \ --boost-libs=${boost.out}/lib
--with-examples \
--prefix=$out
''; '';
buildPhase = '' buildPhase = ''
./waf ./waf
@ -45,6 +45,5 @@ stdenv.mkDerivation {
license = licenses.lgpl3; license = licenses.lgpl3;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ maintainers.sjmackenzie ]; maintainers = [ maintainers.sjmackenzie ];
broken = true; # 2018-04-11
}; };
} }