From 2e736e2ce85ea7ac3d27cef9995db42416c5e42f Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <tgagnaux@gmail.com>
Date: Sat, 15 Mar 2025 08:58:25 +0100
Subject: [PATCH] angular-language-server: fix collisions by using

the nixpkgs typescript package in the wrapper instead of the vendored
typescript.
---
 pkgs/by-name/an/angular-language-server/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix
index 95acc02577b0..899618766e55 100644
--- a/pkgs/by-name/an/angular-language-server/package.nix
+++ b/pkgs/by-name/an/angular-language-server/package.nix
@@ -11,6 +11,7 @@
   common-updater-scripts,
   jq,
   unzip,
+  typescript,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -31,9 +32,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    install -Dm755 server/bin/ngserver $out/lib/bin/ngserver
-    install -Dm755 server/index.js $out/lib/index.js
-    cp -r node_modules $out/lib/node_modules
+    install -Dm555 server/bin/ngserver $out/lib/bin/ngserver
+    install -Dm444 server/index.js $out/lib/index.js
+    mkdir -p $out/lib/node_modules
+    cp -r node_modules/* $out/lib/node_modules
+    # do not use vendored typescript
+    rm -rf $out/lib/node_modules/typescript
     runHook postInstall
   '';
 
@@ -41,7 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     patchShebangs $out/lib/bin/ngserver $out/lib/index.js $out/lib/node_modules
     makeWrapper $out/lib/bin/ngserver $out/bin/ngserver \
       --prefix PATH : ${lib.makeBinPath [ nodejs ]} \
-      --add-flags "--tsProbeLocations $out/lib/node_modules --ngProbeLocations $out/lib/node_modules"
+      --add-flags "--tsProbeLocations ${typescript}/lib/node_modules/typescript --ngProbeLocations $out/lib/node_modules"
   '';
 
   passthru = {