diff options
| author | Stewart Mackenzie <setori88@gmail.com> | 2018-10-21 03:16:26 +0800 |
|---|---|---|
| committer | Joachim Schiele <js@lastlog.de> | 2018-10-20 21:16:26 +0200 |
| commit | d0b9f95ac8e6a0ff241247200fbc8de079f50f9e (patch) | |
| tree | ff068bc4bcc8012150a901a6e751158cc6607e5e /pkgs/development/libraries/ndn-cxx | |
| parent | 0c7934017bf335e13ad6abb3fe5b81634cd26e5e (diff) | |
ndn-cxx: fixed broken build and updated to latest release (#48706)
Diffstat (limited to 'pkgs/development/libraries/ndn-cxx')
| -rw-r--r-- | pkgs/development/libraries/ndn-cxx/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 1040cb9a9343..a8d7f654a9ff 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchgit, openssl, doxygen, boost, sqlite, cryptopp, pkgconfig, python, pythonPackages }: +{ stdenv, fetchFromGitHub, openssl, doxygen, boost, sqlite, pkgconfig, python, pythonPackages }: let - version = "4c32e7"; + version = "0.6.3"; in stdenv.mkDerivation { - name = "ndn-cxx-0.1-${version}"; - src = fetchgit { - url = "https://github.com/named-data/ndn-cxx.git"; - rev = "4c32e748863d5165cc0e3d6b54a8383f4836cdf1"; - sha256 = "18szs3j3ig8wlcqngran0daxaj7j2qsmch0212ids6fymj1hgax4"; + name = "ndn-cxx-${version}"; + src = fetchFromGitHub { + owner = "named-data"; + repo = "ndn-cxx"; + rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00"; + sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl doxygen boost sqlite cryptopp python pythonPackages.sphinx]; + buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx]; preConfigure = '' patchShebangs waf ./waf configure \ - --with-cryptopp=${cryptopp} \ + --prefix=$out \ + --with-openssl=${openssl.dev} \ --boost-includes=${boost.dev}/include \ - --boost-libs=${boost.out}/lib \ - --with-examples \ - --prefix=$out + --boost-libs=${boost.out}/lib ''; buildPhase = '' ./waf @@ -45,6 +45,5 @@ stdenv.mkDerivation { license = licenses.lgpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ maintainers.sjmackenzie ]; - broken = true; # 2018-04-11 }; } |