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; 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; 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; diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 8808e9987e97..db786fee87bb 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 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 ];