mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
xwaylandvideobridge: support building with qt6, clean up dependencies
This commit is contained in:
parent
5e8bde69b9
commit
41b117f6ed
@ -5,10 +5,14 @@
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
, qtx11extras
|
||||
, kdelibs4support
|
||||
, qtdeclarative
|
||||
, qtx11extras ? null # qt5 only
|
||||
, kcoreaddons
|
||||
, ki18n
|
||||
, knotifications
|
||||
, kpipewire
|
||||
, kstatusnotifieritem ? null # qt6 only
|
||||
, kwindowsystem
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
@ -30,12 +34,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtquickcontrols2
|
||||
qtdeclarative
|
||||
qtx11extras
|
||||
kdelibs4support
|
||||
kcoreaddons
|
||||
ki18n
|
||||
knotifications
|
||||
kpipewire
|
||||
kstatusnotifieritem
|
||||
kwindowsystem
|
||||
];
|
||||
|
||||
cmakeFlags = ["-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}"];
|
||||
|
||||
meta = {
|
||||
description = "Utility to allow streaming Wayland windows to X applications";
|
||||
homepage = "https://invent.kde.org/system/xwaylandvideobridge";
|
||||
|
@ -1700,6 +1700,7 @@ mapAliases {
|
||||
xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25
|
||||
xulrunner = firefox-unwrapped; # Added 2023-11-03
|
||||
xvfb_run = xvfb-run; # Added 2021-05-07
|
||||
xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27
|
||||
|
||||
### Y ###
|
||||
|
||||
|
@ -25575,8 +25575,6 @@ with pkgs;
|
||||
|
||||
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
|
||||
|
||||
xwaylandvideobridge = libsForQt5.callPackage ../tools/wayland/xwaylandvideobridge { };
|
||||
|
||||
yaws = callPackage ../servers/http/yaws { };
|
||||
|
||||
zabbixFor = version: rec {
|
||||
|
@ -287,6 +287,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
|
||||
|
||||
xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { };
|
||||
|
||||
xwaylandvideobridge = callPackage ../tools/wayland/xwaylandvideobridge { };
|
||||
|
||||
yuview = callPackage ../applications/video/yuview { };
|
||||
}) // lib.optionalAttrs pkgs.config.allowAliases {
|
||||
# Remove completely before 24.11
|
||||
|
@ -114,6 +114,7 @@ makeScopeWithSplicing' {
|
||||
|
||||
wayqt = callPackage ../development/libraries/wayqt { };
|
||||
|
||||
xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
|
||||
} // lib.optionalAttrs pkgs.config.allowAliases {
|
||||
# Remove completely before 24.11
|
||||
overrideScope' = builtins.throw "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\".";
|
||||
|
Loading…
Reference in New Issue
Block a user