diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix --- a/nix/dev-shell.nix +++ b/nix/dev-shell.nix @@ -3,18 +3,24 @@ , lib , amqp-cpp , arcanist +, boost , cargo , cmake , cryptopp , darwin +, folly +, fmt , grpc , libiconv , libuv , nodejs-16_x +, olm +, openssl , pkg-config , protobuf_3_15_cmake , python2 , python3 +, sqlite , watchman , rustfmt , yarn @@ -54,6 +60,12 @@ # include any libraries buildInputs buildInputs = [ protobuf_3_15_cmake # exposes both a library and a command, thus should appear in both inputs + folly # cpp tools + fmt # needed for folly + boost # needed for folly + olm # needed for CryptoTools + sqlite # needed for sqlite_orm + openssl # needed for grpc ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices diff --git a/nix/overlay.nix b/nix/overlay.nix --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -26,4 +26,11 @@ # around calling strlen() with null php = prev.php80; }); + + olm = prev.olm.overrideAttrs(oldAttrs: { + # *.hh files aren't meant to be used externally, so we patch installation to add it + postInstall = '' + cp $NIX_BUILD_TOP/${oldAttrs.src.name}/include/olm/*.h* ''${!outputDev}/include/olm + ''; + }); }