From caba927c4a1efe31f8663fedff38e70890badc17 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 15 Dec 2021 14:23:03 +0300 Subject: [PATCH] lttng-ust: 2.13.0 -> 2.13.1, make generic --- .../tools/misc/lttng-ust/default.nix | 44 ++----------------- .../tools/misc/lttng-ust/generic.nix | 44 +++++++++++++++++++ 2 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 pkgs/development/tools/misc/lttng-ust/generic.nix 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 ]; + }; + +}