From fd2f2bbe6f23408cf73507e40e7fea40485b0bd5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 19 Feb 2018 12:37:46 -0500
Subject: [PATCH] riscv-pk: Add a variant with a kernel

---
 pkgs/misc/riscv-pk/default.nix  | 5 ++++-
 pkgs/top-level/all-packages.nix | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix
index 025d591d137..5f0d1fa438f 100644
--- a/pkgs/misc/riscv-pk/default.nix
+++ b/pkgs/misc/riscv-pk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }: let
+{ stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let
   rev = "e5846a2bc707eaa58dc8ab6a8d20a090c6ee8570";
   sha256 = "1clynpp70fnbgsjgxx7xi0vrdrj1v0h8zpv0x26i324kp2gwylf4";
   revCount = "438";
@@ -21,6 +21,9 @@ in stdenv.mkDerivation {
 
   configureScript = "../configure";
 
+  configureFlags = stdenv.lib.optional (payload != null)
+    "--with-payload=${payload}";
+
   hardeningDisable = [ "all" ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 632a67a6fb1..3a60250d6e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13565,6 +13565,10 @@ with pkgs;
 
   riscv-pk = callPackage ../misc/riscv-pk { };
 
+  riscv-pk-with-kernel = riscv-pk.override {
+    payload = "${linux_riscv}/vmlinux";
+  };
+
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
   rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };