Merge pull request #268261 from wineee/qt-video-wlr
qt-video-wlr: 2020-08-03 -> 2023-07-22
This commit is contained in:
commit
0816d1426f
2 changed files with 19 additions and 20 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia }:
|
{ stdenv, lib, fetchFromGitHub, pkg-config, meson, cmake, ninja, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia, layer-shell-qt }:
|
||||||
let
|
let
|
||||||
gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
|
gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
|
||||||
gstreamer
|
gstreamer
|
||||||
|
@ -9,38 +9,39 @@ let
|
||||||
];
|
];
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "qt-video-wlr";
|
pname = "qt-video-wlr";
|
||||||
version = "2020-08-03";
|
version = "2023-07-22";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xdavidwu";
|
owner = "xdavidwu";
|
||||||
repo = "qt-video-wlr";
|
repo = "qt-video-wlr";
|
||||||
rev = "f88a7aa43f28b879b18752069f4a1ec33d73f2fe";
|
rev = "1373c8eeb0a5d867927ba30a9a9bb2d5b0057a87";
|
||||||
sha256 = "135kfyg1b61xvfpk8vpk4qyw6s9q1mn3a6lfkrqrhl0dz9kka9lx";
|
hash = "sha256-mg0ROD9kV88I5uCm+niAI5tJuhkmYC7Z8dixxrNow4c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config meson ninja wrapQtAppsHook ];
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
meson
|
||||||
|
cmake # only used for find layer-shell-qt
|
||||||
|
ninja
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
wayland
|
qtbase
|
||||||
pixman
|
qtmultimedia
|
||||||
cairo
|
layer-shell-qt
|
||||||
librsvg
|
|
||||||
wayland-protocols
|
|
||||||
wlroots
|
|
||||||
libxkbcommon
|
|
||||||
qtbase
|
|
||||||
qtmultimedia
|
|
||||||
];
|
];
|
||||||
|
|
||||||
qtWrapperArgs = [
|
qtWrapperArgs = [
|
||||||
"--prefix PATH : $out/bin/qt-video-wlr"
|
"--prefix PATH : $out/bin/qt-video-wlr"
|
||||||
"--prefix GST_PLUGIN_PATH : ${gstreamerPath}"
|
"--prefix GST_PLUGIN_PATH : ${gstreamerPath}"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Qt pip-mode-like video player for wlroots-based wayland compositors";
|
description = "Qt pip-mode-like video player for wlroots-based wayland compositors";
|
||||||
homepage = "https://github.com/xdavidwu/qt-video-wlr";
|
homepage = "https://github.com/xdavidwu/qt-video-wlr";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ fionera ];
|
maintainers = with maintainers; [ fionera rewine ];
|
||||||
platforms = with platforms; linux;
|
platforms = with platforms; linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5480,9 +5480,7 @@ with pkgs;
|
||||||
|
|
||||||
flashfocus = callPackage ../misc/flashfocus { };
|
flashfocus = callPackage ../misc/flashfocus { };
|
||||||
|
|
||||||
qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr {
|
qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { };
|
||||||
wlroots = wlroots_0_15;
|
|
||||||
};
|
|
||||||
|
|
||||||
fwup = callPackage ../tools/misc/fwup {
|
fwup = callPackage ../tools/misc/fwup {
|
||||||
inherit (darwin.apple_sdk.frameworks) DiskArbitration;
|
inherit (darwin.apple_sdk.frameworks) DiskArbitration;
|
||||||
|
|
Loading…
Reference in a new issue