diff options
| author | Artturi <Artturin@artturin.com> | 2023-09-06 21:17:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-06 21:17:12 +0300 |
| commit | 872e54e9e72665421ba81327780313b915272a8b (patch) | |
| tree | cf7a95421840869f700d842ceffe87f7331d378f /pkgs/development/compilers/llvm/14/default.nix | |
| parent | 0d16a6b6a59e490a0b18d3a8a17ceca6267e1b44 (diff) | |
| parent | d7d68a1a04b8846bff8b5816679441ad5c97f290 (diff) | |
Merge pull request #253533 from Artturin/llvmusesuball
Diffstat (limited to 'pkgs/development/compilers/llvm/14/default.nix')
| -rw-r--r-- | pkgs/development/compilers/llvm/14/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 5a198cbbbbe3b..8b0dc428d39f7 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -139,12 +139,13 @@ let lldb = callPackage ../common/lldb.nix { patches = let - resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch" - { - clangLibDir = "${libclang.lib}/lib"; - } '' - substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir - '')) { }; + resourceDirPatch = callPackage + ({ substituteAll, libclang }: substituteAll + { + src = ./lldb/resource-dir.patch; + clangLibDir = "${libclang.lib}/lib"; + }) + { }; in [ ./lldb/procfs.patch @@ -165,7 +166,7 @@ let && !stdenv.targetPlatform.isAarch64 && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") ) ./lldb/cpu_subtype_arm64e_replacement.patch; - inherit llvm_meta release_version; + inherit llvm_meta; }; # Below, is the LLVM bootstrapping logic. It handles building a |