diff options
Diffstat (limited to 'nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch')
| -rw-r--r-- | nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch index 30ab3f9b21c2..fb55816b942c 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 890abd4..157a8a1 100644 +index 37745b5..cad11a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,13 +16,6 @@ endif() set(VERSION "${VERSION}${VERSION_SUFFIX}") message("Version ${VERSION}") - + -set(LLDB_PACKAGE $ENV{LLDB_PACKAGE} CACHE PATH "Zip archive containing LLDB files") -if (LLDB_PACKAGE) - message("Using LLDB_PACKAGE=${LLDB_PACKAGE}") @@ -14,15 +14,15 @@ index 890abd4..157a8a1 100644 -endif() - set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]") - + # General OS-specific definitions @@ -87,16 +80,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) - + -# Run 'npm install' -execute_process( -- COMMAND ${NPM} install +- COMMAND ${NPM} ci # like install, but actually respects package-lock file. - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE Result -) @@ -32,3 +32,5 @@ index 890abd4..157a8a1 100644 - # Copy it back, so we can commit the lock file. file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) + + |