summary refs log tree commit diff
path: root/pkgs/os-specific/linux/lttng-modules
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2018-06-07 12:44:56 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2018-06-07 22:29:35 +0200
commit0f8594170a7593063886fca4c3820a0b104a47d7 (patch)
tree993f939e2d72fd9ea72e67596e9bbaa24d032bea /pkgs/os-specific/linux/lttng-modules
parentca6569c96ae64d17fbab1483d6688922372aeedc (diff)
downloadnixlib-0f8594170a7593063886fca4c3820a0b104a47d7.tar
nixlib-0f8594170a7593063886fca4c3820a0b104a47d7.tar.gz
nixlib-0f8594170a7593063886fca4c3820a0b104a47d7.tar.bz2
nixlib-0f8594170a7593063886fca4c3820a0b104a47d7.tar.lz
nixlib-0f8594170a7593063886fca4c3820a0b104a47d7.tar.xz
nixlib-0f8594170a7593063886fca4c3820a0b104a47d7.tar.zst
nixlib-0f8594170a7593063886fca4c3820a0b104a47d7.zip
lttng-modules: add 'libelf' to fix build against linux 4.14
Fixes this:

$ nix-build -A linuxPackages.lttng-modules
[...]
/nix/store/...-linux-4.14.48-dev/lib/modules/4.14.48/source/Makefile:948: \
  *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfu

(Linux 4.16+ has other issues, so mark as broken.)
Diffstat (limited to 'pkgs/os-specific/linux/lttng-modules')
-rw-r--r--pkgs/os-specific/linux/lttng-modules/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 7c2233714d4c..413ac3efbe54 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, kernel, libelf }:
 
 stdenv.mkDerivation rec {
   pname = "lttng-modules-${version}";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq";
   };
 
+  buildInputs = [ libelf ];
+
   hardeningDisable = [ "pic" ];
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-function-declaration" ];
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
     broken = builtins.compareVersions kernel.version "3.18" == -1
-      || builtins.compareVersions kernel.version "4.11" == 1;
+      || builtins.compareVersions kernel.version "4.16" == 1;
   };
 
 }