diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-19 12:37:46 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-19 12:37:46 -0500 |
| commit | fd2f2bbe6f23408cf73507e40e7fea40485b0bd5 (patch) | |
| tree | f498775d4d111537b8160db3db3b3578521d2556 | |
| parent | 6173f2f945a2a62fb20caa86947e5f68ccacfdd8 (diff) | |
| download | nixpkgs-fd2f2bbe6f23408cf73507e40e7fea40485b0bd5.tar nixpkgs-fd2f2bbe6f23408cf73507e40e7fea40485b0bd5.tar.gz nixpkgs-fd2f2bbe6f23408cf73507e40e7fea40485b0bd5.tar.bz2 nixpkgs-fd2f2bbe6f23408cf73507e40e7fea40485b0bd5.tar.lz nixpkgs-fd2f2bbe6f23408cf73507e40e7fea40485b0bd5.tar.xz nixpkgs-fd2f2bbe6f23408cf73507e40e7fea40485b0bd5.tar.zst nixpkgs-fd2f2bbe6f23408cf73507e40e7fea40485b0bd5.zip | |
riscv-pk: Add a variant with a kernel
| -rw-r--r-- | pkgs/misc/riscv-pk/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 1 deletions
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 { }; |