From 67f14b24ee0e4ab74aba0debba6d51c1be6ee3d9 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 28 Jul 2025 16:07:38 +0200 Subject: [PATCH] mctc-lib: add option to build with cmake in addition to meson --- pkgs/by-name/mc/mctc-lib/package.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix index b9cd86658d22..62d9814ecd10 100644 --- a/pkgs/by-name/mc/mctc-lib/package.nix +++ b/pkgs/by-name/mc/mctc-lib/package.nix @@ -3,14 +3,23 @@ lib, fetchFromGitHub, gfortran, + buildType ? "meson", meson, ninja, + cmake, pkg-config, python3, toml-f, jonquil, }: +assert ( + builtins.elem buildType [ + "meson" + "cmake" + ] +); + stdenv.mkDerivation rec { pname = "mctc-lib"; version = "0.4.2"; @@ -26,18 +35,23 @@ stdenv.mkDerivation rec { # Allow dynamically linked jonquil as dependency. That then additionally # requires linking in toml-f ./meson.patch + + # Fix wrong generation of package config include paths + ./cmake.patch ]; nativeBuildInputs = [ gfortran pkg-config python3 + ] + ++ lib.optionals (buildType == "meson") [ meson ninja - ]; + ] + ++ lib.optional (buildType == "cmake") cmake; buildInputs = [ - toml-f jonquil ];