diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-07 02:53:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-07 02:53:40 +0200 |
| commit | 8bf9a5e9d9799b6333e8caeeb4ea09c492dc1c51 (patch) | |
| tree | 905b6835b6effe8bc1a0c2413700a240b76006cc | |
| parent | c639e2186113ebdba79bbb81a075ae496e2f13ba (diff) | |
| parent | 77488646553eb062f27cad53345eeccbd8d7b4d1 (diff) | |
| download | nixpkgs-8bf9a5e9d9799b6333e8caeeb4ea09c492dc1c51.tar nixpkgs-8bf9a5e9d9799b6333e8caeeb4ea09c492dc1c51.tar.gz nixpkgs-8bf9a5e9d9799b6333e8caeeb4ea09c492dc1c51.tar.bz2 nixpkgs-8bf9a5e9d9799b6333e8caeeb4ea09c492dc1c51.tar.lz nixpkgs-8bf9a5e9d9799b6333e8caeeb4ea09c492dc1c51.tar.xz nixpkgs-8bf9a5e9d9799b6333e8caeeb4ea09c492dc1c51.tar.zst nixpkgs-8bf9a5e9d9799b6333e8caeeb4ea09c492dc1c51.zip | |
Merge pull request #129460 from j-brn/master
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kvmfr/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 40 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 569e99f52ec..162f9d1b4c9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4643,6 +4643,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"; diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix new file mode 100644 index 00000000000..a7949c85c2e --- /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 2e04bc25bb8..f6e95914730 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21017,6 +21017,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 { }; |