From fdef885d9769fe619e1f9b7bc780047cd2e01fa3 Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Wed, 14 Jun 2017 17:25:46 -0500
Subject: ply: init at v1-beta1(9e810b1)

---
 pkgs/os-specific/linux/ply/default.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/ply/default.nix

(limited to 'pkgs/os-specific/linux')

diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
new file mode 100644
index 000000000000..4d8e5001b0b9
--- /dev/null
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -0,0 +1,30 @@
+{ autoconf, automake, flex, yacc, stdenv, kernel, fetchFromGitHub }:
+let
+  version = "1.0.beta1-9e810b1";
+in stdenv.mkDerivation {
+  name = "ply-${version}";
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
+  buildInputs = [
+    flex
+    yacc
+    kernel
+    stdenv.cc
+  ];
+
+  src = fetchFromGitHub {
+    owner = "iovisor";
+    repo = "ply";
+    rev = "9e810b157ba079c32c430a7d4c6034826982056e";
+    sha256 = "15cp6iczawaqlhsa0af6i37zn5iq53kh6ya8s2hzd018yd7mhg50";
+  };
+
+  preConfigure = "sh autogen.sh --prefix=$out";
+
+  configureFlags = [
+    "--with-kerneldir=${kernel.dev}"
+  ];
+}
-- 
cgit 1.4.1


From f5d98e8e18067fd5980704a04bd44c68514f6778 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Thu, 15 Jun 2017 20:30:12 +0100
Subject: ply: fix build

---
 pkgs/os-specific/linux/ply/default.nix | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'pkgs/os-specific/linux')

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 ];
+  };
 }
-- 
cgit 1.4.1