From 18095b8d94285d85312b85db2d31cb234b88ef77 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 12 Jun 2023 09:56:25 -0400 Subject: [PATCH 1/2] cannelloni: move cmake to nativeBuildInputs --- pkgs/os-specific/linux/cannelloni/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cannelloni/default.nix b/pkgs/os-specific/linux/cannelloni/default.nix index fb7ad90259be..32809e45de7e 100644 --- a/pkgs/os-specific/linux/cannelloni/default.nix +++ b/pkgs/os-specific/linux/cannelloni/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, lksctp-tools, sctpSupport ? true }: +{ lib, stdenv, fetchFromGitHub, cmake, lksctp-tools, sctpSupport ? true }: + stdenv.mkDerivation (finalAttrs: { pname = "cannelloni"; version = "1.1.0"; @@ -8,7 +9,12 @@ stdenv.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = "sha256-pAXHo9NCXMFKYcIJogytBiPkQE0nK6chU5TKiDNCKA8="; }; - buildInputs = [ cmake ] ++ lib.optionals sctpSupport [ lksctp-tools ]; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = lib.optionals sctpSupport [ lksctp-tools ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" From 3fdaa00460d722acee106cff629461511731c18f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 12 Jun 2023 09:58:17 -0400 Subject: [PATCH 2/2] cannelloni: remove -DCMAKE_BUILD_TYPE=Release this is the default --- pkgs/os-specific/linux/cannelloni/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/cannelloni/default.nix b/pkgs/os-specific/linux/cannelloni/default.nix index 32809e45de7e..0a27c53eefc8 100644 --- a/pkgs/os-specific/linux/cannelloni/default.nix +++ b/pkgs/os-specific/linux/cannelloni/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals sctpSupport [ lksctp-tools ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DSCTP_SUPPORT=${lib.boolToString sctpSupport}" ];