From 42ef3589e685ba2ba10a67928341e5a40e225038 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 16 Nov 2024 16:36:42 +0000
Subject: [PATCH] Revert "nodejs_18: fix build with clang 16 mk2"

libc++ 19 no longer supports Clang < 17.

This reverts commit b034e4cbf12f7c0d749674c102e31e6a47fa2d7f.
---
 pkgs/development/web/nodejs/v18.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index b9a50c718cb2..e8783fc314cd 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -1,19 +1,8 @@
-{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python311, fetchpatch2, enableNpm ? true }:
+{ callPackage, lib, openssl, python311, fetchpatch2, enableNpm ? true }:
 
 let
-  # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors.
-  # Use an older version of clang with the current libc++ for compatibility (e.g., with icu).
-  ensureCompatibleCC = packages:
-    if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16"
-      then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override {
-        inherit (packages.llvmPackages) libcxx;
-      })
-      else packages.stdenv;
-
   buildNodejs = callPackage ./nodejs.nix {
     inherit openssl;
-    stdenv = ensureCompatibleCC pkgs;
-    buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; };
     python = python311;
   };