Merge pull request #207033 from j-brn/master
looking-glass-client/kvmfr: B5.0.1 -> B6
This commit is contained in:
commit
18f2ba9ce4
2 changed files with 51 additions and 42 deletions
pkgs
|
@ -1,7 +1,39 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, makeDesktopItem, cmake, pkg-config
|
{ stdenv
|
||||||
, freefont_ttf, spice-protocol, nettle, libbfd, fontconfig, libffi, expat
|
, lib
|
||||||
, libxkbcommon, libGL, libXext, libXrandr, libXi, libXScrnSaver, libXinerama
|
, fetchFromGitHub
|
||||||
, libXcursor, libXpresent, wayland, wayland-protocols
|
, makeDesktopItem
|
||||||
|
, pkg-config
|
||||||
|
, cmake
|
||||||
|
, freefont_ttf
|
||||||
|
, spice-protocol
|
||||||
|
, nettle
|
||||||
|
, libbfd
|
||||||
|
, fontconfig
|
||||||
|
, libffi
|
||||||
|
, expat
|
||||||
|
, libGL
|
||||||
|
|
||||||
|
, libX11
|
||||||
|
, libxkbcommon
|
||||||
|
, libXext
|
||||||
|
, libXrandr
|
||||||
|
, libXi
|
||||||
|
, libXScrnSaver
|
||||||
|
, libXinerama
|
||||||
|
, libXcursor
|
||||||
|
, libXpresent
|
||||||
|
|
||||||
|
, wayland
|
||||||
|
, wayland-protocols
|
||||||
|
|
||||||
|
, pipewire
|
||||||
|
, pulseaudio
|
||||||
|
, libsamplerate
|
||||||
|
|
||||||
|
, xorgSupport ? true
|
||||||
|
, waylandSupport ? true
|
||||||
|
, pipewireSupport ? true
|
||||||
|
, pulseSupport ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -16,40 +48,30 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "looking-glass-client";
|
pname = "looking-glass-client";
|
||||||
version = "B5.0.1";
|
version = "B6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gnif";
|
owner = "gnif";
|
||||||
repo = "LookingGlass";
|
repo = "LookingGlass";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-UzZQU5SzJ2mo9QBweQB0VJSnKfzgTG5QaKpIQN/6LCE=";
|
sha256 = "sha256-6vYbNmNJBCoU23nVculac24tHqH7F4AZVftIjL93WJU=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [ libGL libX11 freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ]
|
||||||
libGL
|
++ lib.optionals xorgSupport [ libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr ]
|
||||||
freefont_ttf
|
++ lib.optionals waylandSupport [ libxkbcommon wayland wayland-protocols ]
|
||||||
spice-protocol
|
++ lib.optionals pipewireSupport [ pipewire libsamplerate ]
|
||||||
expat
|
++ lib.optionals pulseSupport [ pulseaudio libsamplerate ];
|
||||||
libbfd
|
|
||||||
nettle
|
cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ]
|
||||||
fontconfig
|
++ lib.optional (!xorgSupport) "-DENABLE_X11=no"
|
||||||
libffi
|
++ lib.optional (!waylandSupport) "-DENABLE_WAYLAND=no"
|
||||||
libxkbcommon
|
++ lib.optional (!pulseSupport) "-DENABLE_PULSEAUDIO=no"
|
||||||
libXi
|
++ lib.optional (!pipewireSupport) "-DENABLE_PIPEWIRE=no";
|
||||||
libXScrnSaver
|
|
||||||
libXinerama
|
|
||||||
libXcursor
|
|
||||||
libXpresent
|
|
||||||
libXext
|
|
||||||
libXrandr
|
|
||||||
wayland
|
|
||||||
wayland-protocols
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ];
|
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
echo ${src.rev} > source/VERSION
|
echo ${src.rev} > source/VERSION
|
||||||
|
@ -73,7 +95,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
homepage = "https://looking-glass.io/";
|
homepage = "https://looking-glass.io/";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ alexbakker babbaj ];
|
maintainers = with maintainers; [ alexbakker babbaj j-brn ];
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, kmod, looking-glass-client }:
|
{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "kvmfr";
|
pname = "kvmfr";
|
||||||
|
@ -9,19 +9,6 @@ stdenv.mkDerivation rec {
|
||||||
hardeningDisable = [ "pic" "format" ];
|
hardeningDisable = [ "pic" "format" ];
|
||||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||||
|
|
||||||
patches = lib.optional (kernel.kernelAtLeast "5.16") (fetchpatch {
|
|
||||||
name = "kvmfr-5.16.patch";
|
|
||||||
url = "https://github.com/gnif/LookingGlass/commit/a9b5302a517e19d7a2da114acf71ef1e69cfb497.patch";
|
|
||||||
sha256 = "017nxlk2f7kyjp6llwa74dbczdb1jk8v791qld81dxhzkm9dyqqx";
|
|
||||||
stripLen = 1;
|
|
||||||
})
|
|
||||||
++ lib.optional (kernel.kernelAtLeast "5.18") (fetchpatch {
|
|
||||||
name = "kvmfr-5.18.patch";
|
|
||||||
url = "https://github.com/gnif/LookingGlass/commit/c7029f95042fe902843cb6acbfc75889e93dc210.patch";
|
|
||||||
sha256 = "sha256-6DpL17XWj8BKpiBdKdCPC51MWKLIo6PixQ9UaygT2Zg=";
|
|
||||||
stripLen = 1;
|
|
||||||
});
|
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"KVER=${kernel.modDirVersion}"
|
"KVER=${kernel.modDirVersion}"
|
||||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||||
|
|
Loading…
Reference in a new issue