From f5d98e8e18067fd5980704a04bd44c68514f6778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 15 Jun 2017 20:30:12 +0100 Subject: [PATCH] ply: fix build --- pkgs/os-specific/linux/ply/default.nix | 30 ++++++++++++-------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 4d8e5001b0b9..9d4bdb1e27d3 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,19 +1,9 @@ -{ autoconf, automake, flex, yacc, stdenv, kernel, fetchFromGitHub }: +{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison }: let version = "1.0.beta1-9e810b1"; in stdenv.mkDerivation { name = "ply-${version}"; - nativeBuildInputs = [ - autoconf - automake - ]; - - buildInputs = [ - flex - yacc - kernel - stdenv.cc - ]; + nativeBuildInputs = [ autoreconfHook flex yacc ]; src = fetchFromGitHub { owner = "iovisor"; @@ -22,9 +12,17 @@ in stdenv.mkDerivation { sha256 = "15cp6iczawaqlhsa0af6i37zn5iq53kh6ya8s2hzd018yd7mhg50"; }; - preConfigure = "sh autogen.sh --prefix=$out"; + preAutoreconf = '' + # ply wants to install header fails to its build directory + xz -d < ${kernel.src} | tar -xf - + configureFlagsArray+=(--with-kerneldir=$(echo $(pwd)/linux-*)) + ./autogen.sh --prefix=$out + ''; - configureFlags = [ - "--with-kerneldir=${kernel.dev}" - ]; + meta = with stdenv.lib; { + description = "dynamic Tracing in Linux"; + homepage = https://wkz.github.io/ply/; + license = [ licenses.gpl2 ]; + maintainers = with maintainers; [ mic92 mbbx6spp ]; + }; }