looking-glass-client: B7-rc1 -> B7 (#387491)

This commit is contained in:
Austin Horstman
2025-03-06 14:29:41 -06:00
committed by GitHub
2 changed files with 2 additions and 39 deletions
@@ -1,9 +1,7 @@
{
stdenv,
lib,
fetchpatch,
fetchFromGitHub,
makeDesktopItem,
pkg-config,
cmake,
freefont_ttf,
@@ -41,35 +39,19 @@
pipewireSupport ? true,
pulseSupport ? true,
}:
let
desktopItem = makeDesktopItem {
name = "looking-glass-client";
desktopName = "Looking Glass Client";
type = "Application";
exec = "looking-glass-client";
icon = "lg-logo";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "looking-glass-client";
version = "B7-rc1";
version = "B7";
src = fetchFromGitHub {
owner = "gnif";
repo = "LookingGlass";
rev = finalAttrs.version;
hash = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU=";
hash = "sha256-I84oVLeS63mnR19vTalgvLvA5RzCPTXV+tSsw+ImDwQ=";
fetchSubmodules = true;
};
patches = [
# Fix failing cmake assertion when disabling X11 without explicitly enabling Wayland.
(fetchpatch {
url = "https://github.com/gnif/LookingGlass/commit/20972cfd9b940fddf9e7f3d2887a271d16398979.patch";
hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU=";
stripLen = 1;
})
./nanosvg-unvendor.diff
];
@@ -132,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
mkdir -p $out/share/pixmaps
ln -s ${desktopItem}/share/applications $out/share/
cp $src/resources/lg-logo.png $out/share/pixmaps
'';
-18
View File
@@ -1,7 +1,6 @@
{
lib,
stdenv,
fetchpatch,
kernel,
looking-glass-client,
}:
@@ -18,23 +17,6 @@ stdenv.mkDerivation {
];
nativeBuildInputs = kernel.moduleBuildDependencies;
patches = [
# fix build for linux-6_10
(fetchpatch {
url = "https://github.com/gnif/LookingGlass/commit/7305ce36af211220419eeab302ff28793d515df2.patch";
hash = "sha256-97nZsIH+jKCvSIPf1XPf3i8Wbr24almFZzMOhjhLOYk=";
stripLen = 1;
})
# security patch for potential buffer overflow
# https://github.com/gnif/LookingGlass/issues/1133
(fetchpatch {
url = "https://github.com/gnif/LookingGlass/commit/3ea37b86e38a87ee35eefb5d8fcc38b8dc8e2903.patch";
hash = "sha256-Kk1gN1uB86ZJA374zmzM9dwwfMZExJcix3hee7ifpp0=";
stripLen = 1;
})
];
makeFlags = [
"KVER=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"