diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
| commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
| tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix | |
| parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
| parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
| download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 7b44a872adc4..51f4e95ef2b5 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -31,8 +31,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; buildInputs = - lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders - ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders; env.NIX_CFLAGS_COMPILE = toString ([ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" |