From be1817333d654ee4e18a1b25b727d6b30d9772fc Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Mon, 11 May 2026 02:37:58 -0700 Subject: [PATCH] llvmPackages_22.libc: fix by using hdrgen unconditionally --- pkgs/development/compilers/llvm/common/libc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 0ab8e8ae5d92..a51e07ce9bc2 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -31,6 +31,8 @@ let cp -r ${monorepoSrc}/third-party "$out" '' ); + + needHdrGen = isFullBuild || lib.versionAtLeast release_version "22"; in stdenv.mkDerivation (finalAttrs: { inherit pname version patches; @@ -44,13 +46,13 @@ stdenv.mkDerivation (finalAttrs: { python3 ninja ] - ++ (lib.optional isFullBuild python3Packages.pyyaml); + ++ (lib.optional needHdrGen python3Packages.pyyaml); buildInputs = lib.optional (isFullBuild && stdenv.hostPlatform.isLinux) linuxHeaders; outputs = [ "out" ] ++ (lib.optional isFullBuild "dev"); - postUnpack = lib.optionalString isFullBuild '' + postUnpack = lib.optionalString needHdrGen '' chmod +w $sourceRoot/../$pname/utils/hdrgen patchShebangs $sourceRoot/../$pname/utils/hdrgen/main.py chmod +x $sourceRoot/../$pname/utils/hdrgen/main.py