From 1ab2a3ff79f2031c9dcabb961ce2c0b72380d194 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 18 Sep 2026 12:32:18 +0200 Subject: [PATCH 1/5] llvmPackages.compiler-rt: fix python script shebangs --- .../compilers/llvm/common/compiler-rt/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index e04c667ff0ca..fb3f7eb49515 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -128,7 +128,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ jq ]; buildInputs = - lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + lib.optionals (!stdenv.hostPlatform.useLLVM) [ + python3 # FIXME: infinite recursion for pkgsLLVM + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include; strictDeps = true; From 3a0ed81e60a690e5722bf70284d0d48aa4101833 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 18 Sep 2026 14:46:21 +0200 Subject: [PATCH 2/5] llvmPackages.llvm: fix shebangs for opt-viewer scripts --- pkgs/development/compilers/llvm/common/llvm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 20a541a48229..2c807be571f2 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -298,6 +298,7 @@ stdenv.mkDerivation ( buildInputs = [ libxml2 libffi + python3 # for opt-viewer scripts ] ++ optional enablePFM libpfm; # exegesis From ca474301078806847f2408ed4c7664ae34ed259c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 18 Sep 2026 19:24:14 +0200 Subject: [PATCH 3/5] llvmPackages.clang: fix unpatched shebangs --- pkgs/development/compilers/llvm/common/clang/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index dce11c11eb5a..374082a3ccda 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -12,6 +12,7 @@ release_version, version, python3, + perl, buildLlvmPackages, fixDarwinDylibNames, enableManpages ? false, @@ -97,6 +98,8 @@ stdenv.mkDerivation ( buildInputs = [ libxml2 libllvm + python3 + perl ]; strictDeps = true; From f6d8f47ab5a89fcf78979f60fb3ed0f90eea5fe7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 18 Sep 2026 21:16:57 +0200 Subject: [PATCH 4/5] llvmPackages.mlir: fix unpatched shebangs --- pkgs/development/compilers/llvm/common/mlir/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 1727e16a54a5..68a9169d321b 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -8,6 +8,7 @@ runCommand, cmake, ninja, + bashNonInteractive, libxml2, libllvm, version, @@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + bashNonInteractive libllvm libxml2 ]; From ef1c1137709dfb589c928bb23ef53984a6a5bbd7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 18 Sep 2026 22:28:10 +0200 Subject: [PATCH 5/5] llvmPackages.libc: fix hwasan_symbolize shebang --- pkgs/development/compilers/llvm/common/libc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 462ad355317e..9ecd7577139d 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -54,7 +54,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ (lib.optional needHdrGen python3Packages.pyyaml); - buildInputs = lib.optional (isFullBuild && stdenv.hostPlatform.isLinux) linuxHeaders; + buildInputs = [ + python3 + ] + ++ lib.optional (isFullBuild && stdenv.hostPlatform.isLinux) linuxHeaders; strictDeps = true;