about summary refs log tree commit diff
path: root/pkgs/development/tools/misc/lttng-ust
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-08-30 09:07:44 +0000
committerAlyssa Ross <hi@alyssa.is>2021-08-30 10:11:22 +0000
commitab2501bd171f2c930ebd3f3bf6b6a1a228477a08 (patch)
treeb18b2c87d91a65557c542fb0546e96061a9d7569 /pkgs/development/tools/misc/lttng-ust
parent7e495c1b557f8801b538de4a49dac1a5bcae44ba (diff)
lttng-ust: 2.10.5 -> 2.13.0; clarify license
Also enable parallel building; tested at -j48.
Diffstat (limited to 'pkgs/development/tools/misc/lttng-ust')
-rw-r--r--pkgs/development/tools/misc/lttng-ust/default.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index 94d2e4a33f29f..244d6442c15fd 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, liburcu, python3 }:
+{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }:
 
 # NOTE:
 #   ./configure ...
@@ -13,14 +13,15 @@
 
 stdenv.mkDerivation rec {
   pname = "lttng-ust";
-  version = "2.10.5";
+  version = "2.13.0";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
-    sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86";
+    sha256 = "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l";
   };
 
-  buildInputs = [ python3 ];
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ numactl python3 ];
 
   preConfigure = ''
     patchShebangs .
@@ -28,10 +29,12 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ liburcu ];
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     description = "LTTng Userspace Tracer libraries";
     homepage = "https://lttng.org/";
-    license = licenses.lgpl21Plus;
+    license = with licenses; [ lgpl21Only gpl2Only mit ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };