From f6b4c1a4d75bee647c29104710c531398c1a8bab Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 29 Nov 2024 05:33:55 +0800 Subject: [PATCH] obs-studio-plugins.input-overlay: 5.0.5 -> 5.0.6 --- .../obs-studio/plugins/input-overlay.nix | 69 +++++++++++-------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index aff145b1fc74..f818cf689cb1 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -1,32 +1,50 @@ -{ stdenv, lib -, fetchFromGitHub -, cmake -, pkg-config -, obs-studio -, libuiohook -, qtbase -, xorg -, libxkbcommon -, libxkbfile -, SDL2 +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + obs-studio, + libuiohook, + qtbase, + xorg, + libxkbcommon, + libxkbfile, + SDL2, }: stdenv.mkDerivation rec { pname = "obs-input-overlay"; - version = "5.0.5"; + version = "5.0.6"; + src = fetchFromGitHub { owner = "univrsal"; repo = "input-overlay"; - rev = "v${version}"; - hash = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o="; + rev = "refs/tags/${version}"; + hash = "sha256-ju4u7hhx+hTuq7Oh0DBPV8RRM8zqyyvYV74KymU0+2c="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ - obs-studio libuiohook qtbase SDL2 - xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXtst xorg.libXext - xorg.libXi xorg.libXt xorg.libXinerama libxkbcommon libxkbfile + obs-studio + libuiohook + qtbase + SDL2 + xorg.libX11 + xorg.libXau + xorg.libXdmcp + xorg.libXtst + xorg.libXext + xorg.libXi + xorg.libXt + xorg.libXinerama + libxkbcommon + libxkbfile ]; cmakeFlags = [ @@ -37,21 +55,14 @@ stdenv.mkDerivation rec { sed -i '/set(CMAKE_CXX_FLAGS "-march=native")/d' 'source/CMakeLists.txt' ''; - postInstall = '' - mkdir $out/lib $out/share - mv $out/obs-plugins/64bit $out/lib/obs-plugins - rm -rf $out/obs-plugins - mv $out/data $out/share/obs - ''; - dontWrapQtApps = true; - meta = with lib; { + meta = { description = "Show keyboard, gamepad and mouse input on stream"; homepage = "https://github.com/univrsal/input-overlay"; - maintainers = with maintainers; [ glittershark ]; - license = licenses.gpl2; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ glittershark ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; };