From 59a6898da56bd6e0c6071749d0746c9ab7ba5942 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 5 Apr 2021 16:01:43 +0000 Subject: [PATCH] dotnet: fix tracing and createdump --- pkgs/development/compilers/dotnet/build-dotnet.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 3080873bb96a..3ebe6ca40dd4 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -12,6 +12,7 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; , libuuid , zlib , curl +, lttng-ust_2_12 }: let @@ -40,14 +41,17 @@ let in stdenv.mkDerivation rec { inherit pname version; + # Some of these dependencies are `dlopen()`ed. rpath = lib.makeLibraryPath [ + stdenv.cc.cc + lttng-ust_2_12 + zlib + curl icu libunwind libuuid openssl - stdenv.cc.cc - zlib ]; src = fetchurl { @@ -73,7 +77,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet patchelf --set-rpath "${rpath}" $out/dotnet find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; - find $out -type f -name "apphost" -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \; + find $out -type f \( -name "apphost" -or -name "createdump" \) -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \; ''; doInstallCheck = true;