From cf7071bff3cf238e84ea56bb3dc13a3035c28476 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 26 Mar 2024 15:07:29 -0400 Subject: [PATCH] tblite: build with meson --- .../science/chemistry/tblite/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/tblite/default.nix b/pkgs/development/libraries/science/chemistry/tblite/default.nix index 64374972c295..4f8c43a08e49 100644 --- a/pkgs/development/libraries/science/chemistry/tblite/default.nix +++ b/pkgs/development/libraries/science/chemistry/tblite/default.nix @@ -2,8 +2,10 @@ , lib , fetchFromGitHub , fetchpatch -, cmake , gfortran +, meson +, ninja +, pkg-config , blas , lapack , mctc-lib @@ -35,13 +37,12 @@ stdenv.mkDerivation rec { }) ]; - # Fix the Pkg-Config files for doubled store paths - postPatch = '' - substituteInPlace config/template.pc \ - --replace "\''${prefix}/" "" - ''; - - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ + gfortran + meson + ninja + pkg-config + ]; buildInputs = [ blas @@ -56,10 +57,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - doCheck = true; preCheck = '' export OMP_NUM_THREADS=2