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

Merge pull request #268261 from wineee/qt-video-wlr

Browse Source 
qt-video-wlr: 2020-08-03 -> 2023-07-22
This commit is contained in:
Janik 2023-11-21 20:31:04 +01:00 committed by GitHub
commit 0816d1426f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/applications/misc/qt-video-wlr/default.nix
View File

@ -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
gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
gstreamer
@ -9,38 +9,39 @@ let
];
in stdenv.mkDerivation rec {
pname = "qt-video-wlr";
version = "2020-08-03";
version = "2023-07-22";
src = fetchFromGitHub {
owner = "xdavidwu";
repo = "qt-video-wlr";
rev = "f88a7aa43f28b879b18752069f4a1ec33d73f2fe";
sha256 = "135kfyg1b61xvfpk8vpk4qyw6s9q1mn3a6lfkrqrhl0dz9kka9lx";
rev = "1373c8eeb0a5d867927ba30a9a9bb2d5b0057a87";
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 = [
wayland
pixman
cairo
librsvg
wayland-protocols
wlroots
libxkbcommon
qtbase
qtmultimedia
qtbase
qtmultimedia
layer-shell-qt
];
qtWrapperArgs = [
"--prefix PATH : $out/bin/qt-video-wlr"
"--prefix GST_PLUGIN_PATH : ${gstreamerPath}"
"--prefix PATH : $out/bin/qt-video-wlr"
"--prefix GST_PLUGIN_PATH : ${gstreamerPath}"
];
meta = with lib; {
description = "Qt pip-mode-like video player for wlroots-based wayland compositors";
homepage = "https://github.com/xdavidwu/qt-video-wlr";
license = licenses.mit;
maintainers = with maintainers; [ fionera ];
maintainers = with maintainers; [ fionera rewine ];
platforms = with platforms; linux;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -5480,9 +5480,7 @@ with pkgs;
flashfocus = callPackage ../misc/flashfocus { };
qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr {
wlroots = wlroots_0_15;
};
qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { };
fwup = callPackage ../tools/misc/fwup {
inherit (darwin.apple_sdk.frameworks) DiskArbitration;