diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix index 9bc078df0e44..716331738a51 100644 --- a/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -15,11 +15,12 @@ buildLlvmTools, patches ? [ ], devExtraCmakeFlags ? [ ], + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "bolt"; - inherit version patches; + inherit version; # Blank llvm dir just so relative path works src = runCommand "bolt-src-${finalAttrs.version}" { inherit (monorepoSrc) passthru; } ( @@ -41,6 +42,17 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/bolt"; + patches = lib.optionals (lib.versions.major release_version == "19") [ + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; + hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; + }) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e.patch"; + hash = "sha256-l4rQHYbblEADBXaZIdqTG0sZzH4fEQvYiqhLYNZDMa8="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 06a38b45064e..b3c65dd906d0 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -988,16 +988,6 @@ let } // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") { bolt = callPackage ./bolt { - patches = lib.optionals (lib.versions.major metadata.release_version == "19") [ - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; - hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; - }) - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e.patch"; - hash = "sha256-l4rQHYbblEADBXaZIdqTG0sZzH4fEQvYiqhLYNZDMa8="; - }) - ]; }; } );