From 878116272abc6fbc190269319b3c7835c1a6b993 Mon Sep 17 00:00:00 2001 From: j-brn Date: Mon, 28 Jun 2021 22:08:03 +0200 Subject: [PATCH 1/2] maintainers: add j-brn --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7a5c9fcbd7f1..945df62b5104 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4609,6 +4609,12 @@ githubId = 6874204; name = "Jason Carr"; }; + j-brn = { + email = "me@bricker.io"; + github = "j-brn"; + githubId = 40566146; + name = "Jonas Braun"; + }; j-keck = { email = "jhyphenkeck@gmail.com"; github = "j-keck"; From 77488646553eb062f27cad53345eeccbd8d7b4d1 Mon Sep 17 00:00:00 2001 From: j-brn Date: Mon, 28 Jun 2021 22:12:26 +0200 Subject: [PATCH 2/2] kvmfr: init at $looking-glass-client.version --- pkgs/os-specific/linux/kvmfr/default.nix | 32 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/os-specific/linux/kvmfr/default.nix diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix new file mode 100644 index 000000000000..a7949c85c2ee --- /dev/null +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }: + +stdenv.mkDerivation rec { + pname = "kvmfr"; + version = looking-glass-client.version; + + src = looking-glass-client.src; + sourceRoot = "source/module"; + hardeningDisable = [ "pic" "format" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "KVER=${kernel.modDirVersion}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D kvmfr.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc/" + ''; + + meta = with lib; { + description = "Optional kernel module for LookingGlass"; + longDescription = '' + This kernel module implements a basic interface to the IVSHMEM device for LookingGlass when using LookingGlass in VM->VM mode + Additionally, in VM->host mode, it can be used to generate a shared memory device on the host machine that supports dmabuf + ''; + homepage = "https://github.com/gnif/LookingGlass"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ j-brn ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2952e8a7c89..a0bba227ef03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20978,6 +20978,8 @@ in jool = callPackage ../os-specific/linux/jool { }; + kvmfr = callPackage ../os-specific/linux/kvmfr { }; + mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; mwprocapture = callPackage ../os-specific/linux/mwprocapture { };