cmake: fix file fixing process#323286
cmake: fix file fixing process#323286vcunat merged 2 commits intoNixOS:stagingfrom siddharth-narayan:update-cmake-fix
Conversation
|
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. |
|
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? |
|
The switch to staging looks good to me. |
This commit adds the -type f filter to the find command. Previously, -type f only applied to the first file name: *.cmake. The -o command means that -type f has to be added back for the other file names.
|
Does everything look good? |
It became unnecessarily repetitive and complicated.
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 fas a global filter, but instead when-ois 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 ffilter to the other directory types.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.