gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-studio-plugins.obs-media-controls: fix build (#490666)

Browse Source
This commit is contained in:
Gaétan Lepage
2026-02-15 14:29:34 +00:00
committed by GitHub
parent 7a7ac04c39 2aff780484
commit 49b0b6a87f
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/video/obs-studio/plugins/default.nix
+1 -1
View File
@@ -52,7 +52,7 @@
obs-markdown = callPackage ./obs-markdown.nix { };
obs-media-controls = qt6Packages.callPackage ./obs-media-controls.nix { };
obs-media-controls = qt6Packages.callPackage ./obs-media-controls { };
obs-move-transition = callPackage ./obs-move-transition.nix { };
pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix → pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix
+6
View File
@@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-CElK9e+wpnMiup6DwdQpQfVMm6atXvz+JYHsGnv3lFo=";
};
patches = [
# Fix cmake build with qt 6.10
# Submitted upstream: https://github.com/exeldro/obs-media-controls/pull/28
./fix-cmake.patch
];
nativeBuildInputs = [ cmake ];
buildInputs = [
obs-studio
pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch
+25
View File
@@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95172a0..3be0ec3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ else()
target_link_libraries(${PROJECT_NAME} PRIVATE OBS::frontend-api)
endif()
-find_package(Qt6 COMPONENTS Widgets Core)
+find_package(Qt6 REQUIRED COMPONENTS Widgets Core)
if(BUILD_OUT_OF_TREE)
if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD)
find_package(Qt6 REQUIRED Gui)
@@ -33,8 +33,9 @@ if(BUILD_OUT_OF_TREE)
endif()
target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
-if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt_VERSION VERSION_LESS "6.9.0")
- target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
+if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt6_VERSION VERSION_LESS "6.9.0")
+ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
+ target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
endif()
target_compile_options(