cmake: fix file fixing process

[siddharth-narayan]

Description of changes

When dontFixCmake = true is set, sometimes a build can fail with sed complaining that stdin is a directory. This happens because the find command does not apply -type f as a global filter, but instead when -o is used, that filter is lost. This means that directories with names of the form *.cmake.in and CMakeLists.txt can be sent to sed. This PR simply adds the -type f filter to the other directory types.

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[Shawn8901]

Please target that change to staging due to the amount of rebuilds ( https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging ) and please fix your commit message to comply with the contribution guidelines (linked in the PR template) and https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions

Also altering the PR title to some more describing content could be useful.

[siddharth-narayan]

I think I've done what you asked, aside from changing the commit message, because I can't figure out how. Can you confirm if I've done everything correctly so far? How can I change the commit message?

[Shawn8901]

The switch to staging looks good to me.
For the commit message you could check https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/changing-a-commit-message

[siddharth-narayan]

Does everything look good?