about summary refs log tree commit diff
path: root/pkgs/servers/code-server/build-vscode-nogit.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/servers/code-server/build-vscode-nogit.patch')
-rw-r--r--pkgs/servers/code-server/build-vscode-nogit.patch27
1 files changed, 5 insertions, 22 deletions
diff --git a/pkgs/servers/code-server/build-vscode-nogit.patch b/pkgs/servers/code-server/build-vscode-nogit.patch
index 335349e4651a3..ec726c68d438d 100644
--- a/pkgs/servers/code-server/build-vscode-nogit.patch
+++ b/pkgs/servers/code-server/build-vscode-nogit.patch
@@ -1,15 +1,8 @@
 diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh
-index a72549fb..b1b6074b 100755
+index a72549fb..3aed1ad5 100755
 --- a/ci/build/build-vscode.sh
 +++ b/ci/build/build-vscode.sh
-@@ -52,13 +52,12 @@ main() {
-   # since Code tries to get the commit from the `.git` directory which will fail
-   # as it is a submodule.
-   export BUILD_SOURCEVERSION
--  BUILD_SOURCEVERSION=$(git rev-parse HEAD)
-+  BUILD_SOURCEVERSION=none
-
-   # Add the date, our name, links, and enable telemetry (this just makes
+@@ -58,7 +58,6 @@ main() {
    # telemetry available; telemetry can still be disabled by flag or setting).
    # This needs to be done before building as Code will read this file and embed
    # it into the client-side code.
@@ -17,21 +10,11 @@ index a72549fb..b1b6074b 100755
    cp product.json product.original.json # Since jq has no inline edit.
    jq --slurp '.[0] * .[1]' product.original.json <(
      cat << EOF
-@@ -105,17 +104,12 @@ EOF
+@@ -105,7 +104,6 @@ EOF
    # Reset so if you develop after building you will not be stuck with the wrong
    # commit (the dev client will use `oss-dev` but the dev server will still use
    # product.json which will have `stable-$commit`).
 -  git checkout product.json
-
+ 
    popd
-
-   pushd lib/vscode-reh-web-linux-x64
-   # Make sure Code took the version we set in the environment variable.  Not
-   # having a version will break display languages.
--  if ! jq -e .commit product.json; then
--    echo "'commit' is missing from product.json"
--    exit 1
--  fi
-   popd
-
-   # These provide a `code-server` command in the integrated terminal to open
\ No newline at end of file
+