Page MenuHomePhabricator
Files F3376606

D5128.diff
No OneTemporary
Actions

D5128.diff
View Options

diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix
--- a/nix/dev-shell.nix
+++ b/nix/dev-shell.nix
@@ -6,6 +6,7 @@
, aws-sdk-cpp
, better-prompt
, boost
+, c-ares_cmake-config
, cargo
, cmake
, cmake-format
@@ -65,6 +66,7 @@
# Tunnelbroker + CMake
amqp-cpp
+ c-ares_cmake-config
cryptopp
cmake
cmake-format # linting
diff --git a/nix/overlay.nix b/nix/overlay.nix
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -43,6 +43,12 @@
better-prompt = prev.callPackage ./better-prompt.nix { };
+ # c-ares is used to bootstrap curl, so cmake is not available in the default
+ # build
+ c-ares_cmake-config = prev.c-ares.overrideAttrs(o: {
+ nativeBuildInputs = (o.nativeBuildInputs or []) ++ [ prev.cmake ];
+ });
+
protobuf_3_15_cmake = prev.callPackage ./protobuf_3_15.nix { };
devShell = final.callPackage ./dev-shell.nix { };

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 28, 1:14 AM (21 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2592280
Default Alt Text
D5128.diff (879 B)

Event Timeline