From 0f8594170a7593063886fca4c3820a0b104a47d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 7 Jun 2018 12:44:56 +0200 Subject: [PATCH] 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.) --- pkgs/os-specific/linux/lttng-modules/default.nix | 6 ++++-- 1 file 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 7c2233714d4..413ac3efbe5 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; }; }