From e066851f0d52a5b7c79ec26b56c2c8c0b45fde6a Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 30 Dec 2024 20:26:45 -0600 Subject: [PATCH 1/3] looking-glass-client: use nanosvg from nixpkgs Issue building vendored nanosvg, just using the version we have. (cherry picked from commit fac6109b1b8074807f488bc3768878c941f0657c) --- .../nanosvg-unvendor.diff | 28 +++++++++++++++++++ .../lo/looking-glass-client/package.nix | 3 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/by-name/lo/looking-glass-client/nanosvg-unvendor.diff diff --git a/pkgs/by-name/lo/looking-glass-client/nanosvg-unvendor.diff b/pkgs/by-name/lo/looking-glass-client/nanosvg-unvendor.diff new file mode 100644 index 0000000000000..08f7d4ce7d491 --- /dev/null +++ b/pkgs/by-name/lo/looking-glass-client/nanosvg-unvendor.diff @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3755adc..55e1eb3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,7 @@ include(OptimizeForNative) # option(OPTIMIZE_FOR_NATIVE) + include(UninstallTarget) + + find_package(PkgConfig) ++find_package(NanoSVG REQUIRED) + pkg_check_modules(FONTCONFIG REQUIRED IMPORTED_TARGET fontconfig) + + option(ENABLE_OPENGL "Enable the OpenGL renderer" ON) +@@ -106,7 +107,6 @@ include_directories( + ${PROJECT_SOURCE_DIR}/include + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include +- ${PROJECT_TOP}/repos/nanosvg/src + ) + + link_libraries( +@@ -161,6 +161,7 @@ target_compile_definitions(looking-glass-client PRIVATE CIMGUI_DEFINE_ENUMS_AND_ + target_link_libraries(looking-glass-client + ${EXE_FLAGS} + PkgConfig::FONTCONFIG ++ NanoSVG::nanosvg + lg_resources + lg_common + displayservers diff --git a/pkgs/by-name/lo/looking-glass-client/package.nix b/pkgs/by-name/lo/looking-glass-client/package.nix index 4f3dac659a386..973ca6ce4a0a6 100644 --- a/pkgs/by-name/lo/looking-glass-client/package.nix +++ b/pkgs/by-name/lo/looking-glass-client/package.nix @@ -14,6 +14,7 @@ libffi, expat, libGL, + nanosvg, libX11, libxkbcommon, @@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU="; stripLen = 1; }) + ./nanosvg-unvendor.diff ]; nativeBuildInputs = [ @@ -88,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: { nettle fontconfig libffi + nanosvg ] ++ lib.optionals xorgSupport [ libxkbcommon From f2986e68e375540d7025d9a3af7918c364c306f2 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 5 Mar 2025 22:17:08 -0600 Subject: [PATCH 2/3] looking-glass-client: B7-rc1 -> B7 (cherry picked from commit 9b8b1ba8c4083fb6cfe51d36e75e14a276a47b45) --- .../lo/looking-glass-client/package.nix | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/lo/looking-glass-client/package.nix b/pkgs/by-name/lo/looking-glass-client/package.nix index 973ca6ce4a0a6..5e8ee0d2a6848 100644 --- a/pkgs/by-name/lo/looking-glass-client/package.nix +++ b/pkgs/by-name/lo/looking-glass-client/package.nix @@ -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 whithout 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 ''; From c4b3c8efc7a2309b98a9303dd853680b9147a58e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 6 Mar 2025 08:54:43 -0600 Subject: [PATCH 3/3] linuxKernel.packages.kvmfr: fix for looking glass B7 (cherry picked from commit 2dc4a43904bdbb5e19ad1d11381f8502fb5e323e) --- pkgs/os-specific/linux/kvmfr/default.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix index a0d7a58fe87cd..513e5d001e340 100644 --- a/pkgs/os-specific/linux/kvmfr/default.nix +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -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; - }) - - # securtiy 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"