Simplify build file filter

Author: archigup

nix/checks/clang-tidy.nix

@@ -6,18 +6,19 @@
 }:
 let
   inherit (lib) escapeRegex;
-  inherit (gglUtil) clangBuildDir filteredSrc llvmStdenv cFiles;
+  inherit (gglUtil) llvmStdenv cFiles clangChecks;
 
   check-clang-tidy = file: llvmStdenv.mkDerivation {
     name = "clang-tidy-${file}";
     nativeBuildInputs = [ clang-tools ];
     inherit (ggl-clang) buildInputs;
     buildPhase = ''
       set -eo pipefail
-      clang-tidy -p ${clangBuildDir} --quiet --warnings-as-errors='*' \
-        --header-filter='^${escapeRegex (toString filteredSrc)}"}' \
-        ${filteredSrc}/${file} |\
-        sed 's|${filteredSrc}/||'
+      clang-tidy -p ${clangChecks.cmakeBuildDir} \
+        --quiet --warnings-as-errors='*' \
+        --header-filter='^${escapeRegex (toString clangChecks.src)}"}' \
+        ${clangChecks.src}/${file} |\
+        sed 's|${clangChecks.src}/||'
       touch $out
     '';
     dontUnpack = true;

nix/checks/iwyu.nix

@@ -5,7 +5,7 @@
 , ...
 }:
 let
-  inherit (gglUtil) clangBuildDir filteredSrc llvmStdenv cFiles;
+  inherit (gglUtil) llvmStdenv cFiles clangChecks;
 
   check-iwyu = file: llvmStdenv.mkDerivation {
     name = "iwyu-${file}";
@@ -16,12 +16,13 @@ let
       white=$(printf "\e[1;37m")
       red=$(printf "\e[1;31m")
       clear=$(printf "\e[0m")
-      iwyu_tool.py -p ${clangBuildDir} ${filteredSrc}/${file} -o clang -- \
-        -Xiwyu --error -Xiwyu --check_also="${filteredSrc}/*" \
+      iwyu_tool.py -p ${clangChecks.cmakeBuildDir} \
+        ${clangChecks.src}/${file} -o clang -- \
+        -Xiwyu --error -Xiwyu --check_also="${clangChecks.src}/*" \
         -Xiwyu --mapping_file=${src}/misc/iwyu_mappings.yml |\
         { grep error: || true; } |\
         sed 's|\(.*\)error:\(.*\)|'$white'\1'$red'error:'$white'\2'$clear'|' |\
-        sed 's|${filteredSrc}/||'
+        sed 's|${clangChecks.src}/||'
       touch $out
     '';
     dontUnpack = true;

nix/package.nix

@@ -1,5 +1,6 @@
 { lib
 , gglUtil
+, src
 , stdenv
 , pkg-config
 , cmake
@@ -19,7 +20,7 @@
 }:
 stdenv.mkDerivation {
   name = "aws-greengrass-lite";
-  src = gglUtil.filteredSrc;
+  src = lib.fileset.toSource { root = src; fileset = gglUtil.buildFileset; };
   nativeBuildInputs = [ pkg-config cmake ninja ];
   buildInputs = [
     openssl

nix/withOverlays.nix

@@ -13,43 +13,49 @@ in
       (n: v: "-DFETCHCONTENT_SOURCE_DIR_${toUpper n}=${v}")
       deps;
 
-    filteredSrc = lib.fileset.toSource {
-      root = src;
-      fileset = lib.fileset.fileFilter
-        (file: lib.elem file.name [
-          ".clang-tidy"
-          "CMakeLists.txt"
-          "fc_deps.json"
-          "version"
-          "run_nucleus"
-          "recipe.yml"
-          "greengrass-lite.target"
-        ] ||
-        lib.any file.hasExt [ "c" "h" "S" "sql" "cmake" "in" ])
-        src;
-    };
+    buildFileset = lib.fileset.unions (map (p: src + p) [
+      "/CMakeLists.txt"
+      "/fc_deps.json"
+      "/misc/systemd"
+      "/misc/cmake_uninstall.cmake.in"
+      "/version"
+      "/modules"
+      "/bins"
+    ]);
+
+    checkFileset = lib.fileset.unions ([ buildFileset ] ++ (map (p: src + p) [
+      "/.clang-tidy"
+      "/test_modules"
+    ]));
 
     llvmStdenv = final.overrideCC final.llvmPackages.stdenv
       (final.llvmPackages.stdenv.cc.override
         { inherit (final.llvmPackages) bintools; });
 
-    clangBuildDir = llvmStdenv.mkDerivation {
-      name = "clang-build-dir";
-      nativeBuildInputs = [ pkg-config clang-tools ];
-      inherit (ggl-clang) buildInputs;
-      buildPhase = ''
-        ${cmake}/bin/cmake -B $out -S ${filteredSrc} \
-          -D CMAKE_BUILD_TYPE=Debug ${toString fetchContentFlags}
-        rm $out/CMakeFiles/CMakeConfigureLog.yaml
-      '';
-      dontUnpack = true;
-      dontPatch = true;
-      dontConfigure = true;
-      dontInstall = true;
-      dontFixup = true;
-    };
-
     cFiles = map (p: removePrefix ((toString src) + "/") (toString p))
       (fileset.toList (fileset.fileFilter (file: file.hasExt "c") src));
+
+    clangChecks = {
+      src = lib.fileset.toSource {
+        root = src;
+        fileset = checkFileset;
+      };
+
+      cmakeBuildDir = llvmStdenv.mkDerivation {
+        name = "clang-cmake-build-dir";
+        nativeBuildInputs = [ pkg-config clang-tools ];
+        inherit (ggl-clang) buildInputs;
+        buildPhase = ''
+          ${cmake}/bin/cmake -B $out -S ${clangChecks.src} \
+            -D CMAKE_BUILD_TYPE=Debug ${toString fetchContentFlags}
+          rm $out/CMakeFiles/CMakeConfigureLog.yaml
+        '';
+        dontUnpack = true;
+        dontPatch = true;
+        dontConfigure = true;
+        dontInstall = true;
+        dontFixup = true;
+      };
+    };
   };
 }