From 4caedc060f7a664413373a92287f31c9bd90bed4 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 26 Apr 2021 21:46:44 +0200
Subject: [PATCH] llvmPackages_12.libunwind: Make sure we get right llvm
 version

---
 pkgs/development/compilers/llvm/12/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix
index e5d6b316cd1..9a2bfb3fb40 100644
--- a/pkgs/development/compilers/llvm/12/default.nix
+++ b/pkgs/development/compilers/llvm/12/default.nix
@@ -229,12 +229,13 @@ let
         libunwind = libraries.libunwind;
       }));
 
-    openmp = callPackage ./openmp { inherit llvm_meta; };
+    libunwind = callPackage ./libunwind ({
+      inherit (buildLlvmTools) llvm;
+    } // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+    });
 
-    libunwind = callPackage ./libunwind ({ inherit llvm_meta; } //
-      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
-        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
-      }));
+    openmp = callPackage ./openmp { inherit llvm_meta; };
 
   });