From 7e89f8b86b79ac8557be3bb6fa8661e6f347722f Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Fri, 16 Jun 2023 16:10:32 +0200 Subject: [PATCH] packaging-nix: allow disabling GPL code from override Signed-off-by: Philipp Jungkamp --- packaging/nix/villas.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packaging/nix/villas.nix b/packaging/nix/villas.nix index 8659975eb..dc5d08fbc 100644 --- a/packaging/nix/villas.nix +++ b/packaging/nix/villas.nix @@ -2,6 +2,7 @@ # general configuration src, version, + withGpl ? true, withAllExtras ? false, withAllFormats ? false, withAllHooks ? false, @@ -69,12 +70,12 @@ stdenv.mkDerivation { inherit src version; pname = "villas"; - cmakeFlags = - [ - "-DDOWNLOAD_GO=OFF" - "-DCMAKE_BUILD_TYPE=Release" - ] + cmakeFlags = [] + ++ lib.optionals (!withGpl) ["-DWITHOUT_GPL=ON"] ++ lib.optionals withFormatProtobuf ["-DCMAKE_FIND_ROOT_PATH=${protobufcBuildBuild}/bin"]; + postPatch = '' + patchShebangs --host ./tools + ''; preConfigure = '' rm -df common rm -df fpga @@ -82,7 +83,6 @@ stdenv.mkDerivation { ${lib.optionalString withNodeFpga "ln -s ${fpga} fpga"} ''; postInstall = '' - patchShebangs --build $out/bin/villas wrapProgram $out/bin/villas \ --set PATH ${lib.makeBinPath [(placeholder "out") gnugrep coreutils]} '';