From 7d9ac4d1c30cceefd60e79d6819a1e47fbf2a313 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 5 May 2024 13:39:16 -0400 Subject: [PATCH] Revert "llvmPackages.lldb: combine `out` and `lib` outputs on Darwin" This reverts commit 210ebc21235624e55f234dc2306fb1f4981923e2. --- pkgs/development/compilers/llvm/common/lldb.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index c582ac863941..59e427e846c4 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -50,9 +50,7 @@ stdenv.mkDerivation (rec { src = src'; inherit patches; - # LLDB expects to find the path to `bin` relative to `lib` on Darwin. It can’t be patched with the location of - # the `lib` output because that would create a cycle between it and the `out` output. - outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "lib" ]; + outputs = [ "out" "lib" "dev" ]; sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}";