diff options
author | Artturin <Artturin@artturin.com> | 2023-11-21 17:45:58 +0200 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2023-11-21 17:45:58 +0200 |
commit | f6749cddad78531de21e0779c0251f66976e8098 (patch) | |
tree | 15ad9db87d0792cced2e1237e0a147d7b7adf5e4 /pkgs/development/compilers/llvm | |
parent | b59fd202d70faa17d0150bae3dd81d3461545a10 (diff) | |
download | nixlib-f6749cddad78531de21e0779c0251f66976e8098.tar nixlib-f6749cddad78531de21e0779c0251f66976e8098.tar.gz nixlib-f6749cddad78531de21e0779c0251f66976e8098.tar.bz2 nixlib-f6749cddad78531de21e0779c0251f66976e8098.tar.lz nixlib-f6749cddad78531de21e0779c0251f66976e8098.tar.xz nixlib-f6749cddad78531de21e0779c0251f66976e8098.tar.zst nixlib-f6749cddad78531de21e0779c0251f66976e8098.zip |
llvmPackages_11.compiler-rt: restore `libcxxabi` argument
Removing this caused `error: anonymous function at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-2/pkgs/development/compilers/llvm/11/compiler-rt/default.nix:1:1 called with unexpected argument 'libcxxabi'` https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20%2Fcompiler-rt.override%2F&type=code The argument became unused in https://github.com/nixos/nixpkgs/commit/56fcbcd1543188fcc855df7e79fee0a8df259681#diff-b1bb77941db4393b7d2cf7a370cee294318418f2507b7a78e22353d1afbb6d21L18 but it was not removed from `buildInputs` in later `llvmPackages` because `llvmPackages_12` had been created before this change was done. Removing `libcxxabi` from `buildInputs` may have to be applied to the other `llvmPackages` too.
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r-- | pkgs/development/compilers/llvm/11/compiler-rt/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix index a41aa7ac4074..38dc7a0fbdc8 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libxcrypt +{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: |