From e4f8498c0bc5add1d704f2c8cc7fd39a48088f0b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 24 Apr 2021 11:40:28 +0200 Subject: [PATCH] llvmPackages_12: Create subdirectories for the last two packages For consistency. Now all packages will have their own subdirectory (continuation of 781e69d19c4). --- .../compilers/llvm/12/{bintools.nix => bintools/default.nix} | 0 pkgs/development/compilers/llvm/12/default.nix | 4 ++-- .../compilers/llvm/12/{openmp.nix => openmp/default.nix} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/compilers/llvm/12/{bintools.nix => bintools/default.nix} (100%) rename pkgs/development/compilers/llvm/12/{openmp.nix => openmp/default.nix} (100%) diff --git a/pkgs/development/compilers/llvm/12/bintools.nix b/pkgs/development/compilers/llvm/12/bintools/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/bintools.nix rename to pkgs/development/compilers/llvm/12/bintools/default.nix diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 5b25f37bc2c..a6d68d2e2a4 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -108,7 +108,7 @@ let # doesn’t support like LLVM. Probably we should move to some other # file. - bintools = callPackage ./bintools.nix {}; + bintools = callPackage ./bintools {}; lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; @@ -203,7 +203,7 @@ let libunwind = libraries.libunwind; })); - openmp = callPackage ./openmp.nix { inherit llvm_meta; }; + openmp = callPackage ./openmp { inherit llvm_meta; }; libunwind = callPackage ./libunwind ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { diff --git a/pkgs/development/compilers/llvm/12/openmp.nix b/pkgs/development/compilers/llvm/12/openmp/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/openmp.nix rename to pkgs/development/compilers/llvm/12/openmp/default.nix