push sheeet

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@

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')

pkgs/by-name/mc/mctc-lib/package.nix

@@ -0,0 +1,80 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  gfortran,
+  buildType ? "meson",
+  meson,
+  ninja,
+  cmake,
+  pkg-config,
+  python3,
+  jonquil,
+}:
+
+assert (
+  builtins.elem buildType [
+    "meson"
+    "cmake"
+  ]
+);
+
+stdenv.mkDerivation rec {
+  pname = "mctc-lib";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "grimme-lab";
+    repo = "mctc-lib";
+    rev = "v${version}";
+    hash = "sha256-MWqvFxFGnFrGppiSy97oUWz7p1sD6GkTrMEZTFgSExg=";
+  };
+
+  patches = [
+    # 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 = [
+    jonquil
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  doCheck = true;
+
+  preCheck = ''
+    export OMP_NUM_THREADS=2
+  '';
+
+  postPatch = ''
+    patchShebangs --build config/install-mod.py
+  '';
+
+  meta = with lib; {
+    description = "Modular computation tool chain library";
+    mainProgram = "mctc-convert";
+    homepage = "https://github.com/grimme-lab/mctc-lib";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.sheepforce ];
+  };
+}