From fac6109b1b8074807f488bc3768878c941f0657c Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 30 Dec 2024 20:26:45 -0600 Subject: [PATCH] looking-glass-client: use nanosvg from nixpkgs Issue building vendored nanosvg, just using the version we have. --- .../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 000000000000..08f7d4ce7d49 --- /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 4f3dac659a38..973ca6ce4a0a 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