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; diff --git a/pkgs/development/tools/misc/lttng-ust/2.12.nix b/pkgs/development/tools/misc/lttng-ust/2.12.nix new file mode 100644 index 000000000000..b3ef1fe65e7f --- /dev/null +++ b/pkgs/development/tools/misc/lttng-ust/2.12.nix @@ -0,0 +1,4 @@ +import ./generic.nix { + version = "2.12.2"; + sha256 = "sha256-vNDwZLbKiMcthOdg6sNHKuXIKEEcY0Q1kivun841n8c="; +} diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 244d6442c15f..3bace16de56d 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,42 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }: - -# NOTE: -# ./configure ... -# [...] -# LTTng-UST will be built with the following options: -# -# Java support (JNI): Disabled -# sdt.h integration: Disabled -# [...] -# -# Debian builds with std.h (systemtap). - -stdenv.mkDerivation rec { - pname = "lttng-ust"; - version = "2.13.0"; - - src = fetchurl { - url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; - sha256 = "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ numactl python3 ]; - - preConfigure = '' - patchShebangs . - ''; - - propagatedBuildInputs = [ liburcu ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "LTTng Userspace Tracer libraries"; - homepage = "https://lttng.org/"; - license = with licenses; [ lgpl21Only gpl2Only mit ]; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; - +import ./generic.nix { + version = "2.13.1"; + sha256 = "sha256-Vme/Amnh5i4tnLl0xFb/huBAG9eqO/yNX9uXIzJJ7dw="; } diff --git a/pkgs/development/tools/misc/lttng-ust/generic.nix b/pkgs/development/tools/misc/lttng-ust/generic.nix new file mode 100644 index 000000000000..e6e67352c859 --- /dev/null +++ b/pkgs/development/tools/misc/lttng-ust/generic.nix @@ -0,0 +1,44 @@ +{ version, sha256 }: + +{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }: + +# NOTE: +# ./configure ... +# [...] +# LTTng-UST will be built with the following options: +# +# Java support (JNI): Disabled +# sdt.h integration: Disabled +# [...] +# +# Debian builds with std.h (systemtap). + +stdenv.mkDerivation rec { + pname = "lttng-ust"; + inherit version; + + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; + inherit sha256; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ numactl python3 ]; + + preConfigure = '' + patchShebangs . + ''; + + propagatedBuildInputs = [ liburcu ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "LTTng Userspace Tracer libraries"; + homepage = "https://lttng.org/"; + license = with licenses; [ lgpl21Only gpl2Only mit ]; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 828d4f53b755..86e07bb5fa20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14946,6 +14946,8 @@ with pkgs; lttng-ust = callPackage ../development/tools/misc/lttng-ust { }; + lttng-ust_2_12 = callPackage ../development/tools/misc/lttng-ust/2.12.nix { }; + lttv = callPackage ../development/tools/misc/lttv { }; luaformatter = callPackage ../development/tools/luaformatter