tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / tools / system / osquery / Remove-git-reset.patch
at github-to-sqlite-beautifulsoup4 1.3 kB view raw
1From: Jack Baldry <jack.baldry@grafana.com> 2Date: Tue, 15 Nov 2022 13:48:07 -0400 3Subject: [PATCH] Remove git reset 4 5This is not required for nixpkgs builds because we are not working in 6the source repository and therefore do not need to be careful about 7updating submodule content. 8 9Signed-off-by: Jack Baldry <jack.baldry@grafana.com> 10--- 11 libraries/cmake/source/modules/utils.cmake | 11 ----------- 12 1 file changed, 11 deletions(-) 13 14diff --git a/libraries/cmake/source/modules/utils.cmake b/libraries/cmake/source/modules/utils.cmake 15--- a/libraries/cmake/source/modules/utils.cmake 16+++ b/libraries/cmake/source/modules/utils.cmake 17@@ -102,17 +102,6 @@ function(patchSubmoduleSourceCode library_name patches_dir source_dir apply_to_d 18 file(COPY "${source_dir}" DESTINATION "${parent_dir}") 19 endif() 20 21- # We need to restore the source code to its original state, pre patch 22- execute_process( 23- COMMAND "${GIT_EXECUTABLE}" reset --hard HEAD 24- RESULT_VARIABLE process_exit_code 25- WORKING_DIRECTORY "${source_dir}" 26- ) 27- 28- if(NOT ${process_exit_code} EQUAL 0) 29- message(FATAL_ERROR "Failed to git reset the following submodule: \"${source_dir}\"") 30- endif() 31- 32 set(patchSubmoduleSourceCode_Patched TRUE PARENT_SCOPE) 33 endfunction() 34 35-- 362.38.1 37