diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 91a0459854bf..1d6eb5b49f79 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -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 { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix similarity index 83% rename from pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix rename to pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix index c4d970a15d92..61a1936ae9b0 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix @@ -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 diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch new file mode 100644 index 000000000000..19f06388ca20 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch @@ -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(