diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-09-14 07:38:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-09-14 07:38:41 +0200 |
| commit | f2ea252d23ebc9a5336bf6a61e0644921f64e67c (patch) | |
| tree | 48baa93e9dd268f250af54fc7faf3148f4577576 /pkgs/development/compilers/llvm/14/default.nix | |
| parent | dc0d53b05443cd66dd242ddd972bac74a58f60ee (diff) | |
| parent | 186767dea40753ffcd7f4f273d9de063b1c88df9 (diff) | |
| download | nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.gz nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.bz2 nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.lz nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.xz nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.zst nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.zip | |
Merge #253854: staging-next 2023-09-07
Diffstat (limited to 'pkgs/development/compilers/llvm/14/default.nix')
| -rw-r--r-- | pkgs/development/compilers/llvm/14/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 75a52b609605..b9a74e0f070a 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 @@ -175,7 +176,7 @@ let # doesn’t support like LLVM. Probably we should move to some other # file. - bintools-unwrapped = callPackage ./bintools {}; + bintools-unwrapped = callPackage ../common/bintools.nix { }; bintoolsNoLibc = wrapBintoolsWith { bintools = tools.bintools-unwrapped; |