dftd4: 3.7.0 -> 4.2.0

pkgs/by-name/df/dftd4/build-paths.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f222aab..262b505 100644
+index 3db5442..64fa14a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -89,7 +89,6 @@ target_include_directories(
@@ -20,29 +20,38 @@ index f222aab..262b505 100644
  if(WITH_API)
    enable_language("C")
 diff --git a/config/template.cmake b/config/template.cmake
-index 8b5141d..8f94d66 100644
+index 8b5141d..76654d1 100644
 --- a/config/template.cmake
 +++ b/config/template.cmake
-@@ -6,7 +6,6 @@ set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@)
+@@ -5,8 +5,7 @@ set("@PROJECT_NAME@_WITH_API_V2" @WITH_API_V2@)
+ set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@)
  set(
    "@PROJECT_NAME@_INCLUDE_DIRS"
-   "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
+-  "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
 -  "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@module-dir@"
++  "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
  )
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
  
 diff --git a/config/template.pc b/config/template.pc
-index 3d6efbb..fea69e4 100644
+index 3d6efbb..55b899f 100644
 --- a/config/template.pc
 +++ b/config/template.pc
-@@ -6,4 +6,4 @@ Name: @PROJECT_NAME@
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: @PROJECT_NAME@
  Description: @PROJECT_DESCRIPTION@
  Version: @PROJECT_VERSION@
  Libs: -L${libdir} -l@PROJECT_NAME@
 -Cflags: -I${includedir} -I${includedir}/@module-dir@
 +Cflags: -I${includedir} -I${includedir}/
 diff --git a/meson.build b/meson.build
-index c9e9c58..ac8f0bd 100644
+index 7de7d61..81b8a7d 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -83,7 +83,7 @@ if install

pkgs/by-name/df/dftd4/cmake.patch

@@ -1,13 +0,0 @@
-diff --git a/config/template.pc b/config/template.pc
-index 3d6efbb..e338a42 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@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: @PROJECT_NAME@
- Description: @PROJECT_DESCRIPTION@

pkgs/by-name/df/dftd4/package.nix

@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   gfortran,
-  buildType ? "meson",
+  buildType ? "cmake",
   cmake,
   meson,
   ninja,
@@ -26,21 +26,18 @@ assert (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dftd4";
-  version = "3.7.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "dftd4";
     repo = "dftd4";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dixPCLH5dWkE2/7ghGEXJmX2/g1DN30dB4jX2d7fmio=";
+    hash = "sha256-uKjNOIza3/I0oREp88oFESoNqEdumo1AztIjcrVb1O8=";
   };
 
   patches = [
-    # Make sure fortran headers are installed directly in /include
-    ./fortran-module-dir.patch
-
-    # Fix wrong generation of package config include paths
-    ./cmake.patch
+    # Fix pkg-config, meson and cmake paths for include and lib dirs
+    ./build-paths.patch
   ];
 
   nativeBuildInputs = [