From 1b53ec3a4502ad8ee7fa357405af87a3bb72b455 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 30 Mar 2025 21:05:14 -0700 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.lldb: move into lldb directory --- pkgs/development/compilers/llvm/common/default.nix | 2 +- .../compilers/llvm/common/{lldb.nix => lldb/default.nix} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/compilers/llvm/common/{lldb.nix => lldb/default.nix} (99%) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index a61ad6b085ba..b8b795bc6c54 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -228,7 +228,7 @@ let lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; } ); - lldb = callPackage ./lldb.nix ( + lldb = callPackage ./lldb ( { } // lib.optionalAttrs (lib.versions.major metadata.release_version == "16") { diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb/default.nix similarity index 99% rename from pkgs/development/compilers/llvm/common/lldb.nix rename to pkgs/development/compilers/llvm/common/lldb/default.nix index 97de8b33707f..3be8102e5315 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation ( ++ lib.optional (lib.versionOlder release_version "14") ( getVersionFile "lldb/gnu-install-dirs.patch" ) - ++ lib.optional (lib.versionAtLeast release_version "14") ./lldb/gnu-install-dirs.patch; + ++ lib.optional (lib.versionAtLeast release_version "14") ./gnu-install-dirs.patch; nativeBuildInputs = [