diff --git a/pkgs/by-name/mc/mctc-lib/cmake.patch b/pkgs/by-name/mc/mctc-lib/cmake.patch new file mode 100644 index 000000000000..e4bd894f2369 --- /dev/null +++ b/pkgs/by-name/mc/mctc-lib/cmake.patch @@ -0,0 +1,29 @@ +diff --git a/config/template.cmake b/config/template.cmake +index 2b3abcbb..59fcd728 100644 +--- a/config/template.cmake ++++ b/config/template.cmake +@@ -8,9 +8,7 @@ if(NOT TARGET "@PROJECT_NAME@::@PROJECT_NAME@") + + include(CMakeFindDependencyMacro) + +- if(NOT TARGET "OpenMP::OpenMP_Fortran" AND "@PROJECT_NAME@_WITH_OpenMP") +- find_dependency("OpenMP") +- endif() ++ find_dependency("OpenMP") + + if(NOT TARGET "toml-f::toml-f" AND "@PROJECT_NAME@_WITH_JSON") + find_dependency("toml-f") +diff --git a/config/template.pc b/config/template.pc +index 84c3498c..2da50191 100644 +--- a/config/template.pc ++++ b/config/template.pc +@@ -1,6 +1,6 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PROJECT_NAME@ + Description: @PROJECT_DESCRIPTION@ diff --git a/pkgs/by-name/mc/mctc-lib/meson.patch b/pkgs/by-name/mc/mctc-lib/meson.patch new file mode 100644 index 000000000000..d6b38d9c2fe8 --- /dev/null +++ b/pkgs/by-name/mc/mctc-lib/meson.patch @@ -0,0 +1,37 @@ +diff --git a/config/meson.build b/config/meson.build +index f54857ee..aaafdb03 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -56,9 +56,12 @@ jonquil_dep = dependency( + 'jonquil', + required: get_option('json'), + fallback: ['jonquil','jonquil_dep'], +- default_options: [ +- 'default_library=static', +- ], +- static: get_option('default_library') != 'dynamic', + ) + lib_deps += jonquil_dep ++ ++tomlf_dep = dependency( ++ 'toml-f', ++ required: get_option('json'), ++ fallback: ['toml-f','toml-f_dep'], ++) ++lib_deps += tomlf_dep +diff --git a/meson.build b/meson.build +index 16797c47..6e5290d9 100644 +--- a/meson.build ++++ b/meson.build +@@ -25,11 +25,6 @@ project( + ) + install = not (meson.is_subproject() and get_option('default_library') == 'static') + +-# Check for specific unsupported meson versions +-if meson.version().version_compare('==1.8.0') +- error('Meson version 1.8.0 has a known issue — please use any other version ≥ 0.55.0') +-endif +- + # General configuration information + lib_deps = [] + subdir('config') diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix index 2f85e6912070..b9cd86658d22 100644 --- a/pkgs/by-name/mc/mctc-lib/package.nix +++ b/pkgs/by-name/mc/mctc-lib/package.nix @@ -7,29 +7,39 @@ ninja, pkg-config, python3, - json-fortran, + toml-f, + jonquil, }: stdenv.mkDerivation rec { pname = "mctc-lib"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "grimme-lab"; repo = "mctc-lib"; rev = "v${version}"; - hash = "sha256-AMRHvzL6CUPItCs07LLOB6Al3yfs8WgrPKRhuNbXiGw="; + hash = "sha256-Qd7mpNE23Z+LuiUwhUzfVzVZEQ+sdnkxMm+W7Hlrss4="; }; + patches = [ + # Allow dynamically linked jonquil as dependency. That then additionally + # requires linking in toml-f + ./meson.patch + ]; + nativeBuildInputs = [ gfortran - meson - ninja pkg-config python3 + meson + ninja ]; - buildInputs = [ json-fortran ]; + buildInputs = [ + toml-f + jonquil + ]; outputs = [ "out"