From 5eb947ad564ae5160113fa869e4c70348be9d743 Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Thu, 15 Jun 2023 17:22:38 +0200 Subject: [PATCH] packaging-nix: Use correct binary path for villas-api Signed-off-by: Philipp Jungkamp --- packaging/nix/villas.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packaging/nix/villas.nix b/packaging/nix/villas.nix index dc5d08fbc..c47d36afb 100644 --- a/packaging/nix/villas.nix +++ b/packaging/nix/villas.nix @@ -33,6 +33,7 @@ coreutils, fpga, graphviz, + jq, lib, makeWrapper, pkg-config, @@ -70,7 +71,11 @@ stdenv.mkDerivation { inherit src version; pname = "villas"; - cmakeFlags = [] + outputs = ["out" "dev"]; + cmakeFlags = + [ + "-DDOWNLOAD_GO=OFF" + ] ++ lib.optionals (!withGpl) ["-DWITHOUT_GPL=ON"] ++ lib.optionals withFormatProtobuf ["-DCMAKE_FIND_ROOT_PATH=${protobufcBuildBuild}/bin"]; postPatch = '' @@ -85,6 +90,8 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/villas \ --set PATH ${lib.makeBinPath [(placeholder "out") gnugrep coreutils]} + wrapProgram $out/bin/villas-api \ + --set PATH ${lib.makeBinPath [coreutils curl jq]} ''; nativeBuildInputs = [ cmake