From a28f9684e225b3a5b1a78b8ffe530f07ae4bdc11 Mon Sep 17 00:00:00 2001 From: Babeuh <60193302+babeuh@users.noreply.github.com> Date: Thu, 13 Jul 2023 17:07:24 +0200 Subject: [PATCH 1/2] maintainers: add babeuh --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2b1df9ae0b31..44e0f4abbd4f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1724,6 +1724,12 @@ fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; }]; }; + babeuh = { + name = "Raphael Le Goaller"; + email = "babeuh@rlglr.fr"; + github = "babeuh"; + githubId = 60193302; + }; bachp = { email = "pascal.bach@nextrem.ch"; matrix = "@bachp:matrix.org"; From 5e496c9a72beb9619cca6bd45ca6bd52aed40dde Mon Sep 17 00:00:00 2001 From: Babeuh <60193302+babeuh@users.noreply.github.com> Date: Thu, 13 Jul 2023 17:06:43 +0200 Subject: [PATCH 2/2] multiviewer-for-f1: init at 1.24.1 --- .../video/multiviewer-for-f1/default.nix | 103 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 105 insertions(+) create mode 100644 pkgs/applications/video/multiviewer-for-f1/default.nix diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/applications/video/multiviewer-for-f1/default.nix new file mode 100644 index 000000000000..d373a850e65a --- /dev/null +++ b/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -0,0 +1,103 @@ +{ stdenvNoCC +, fetchurl +, lib +, makeWrapper +, autoPatchelfHook +, dpkg +, alsa-lib +, at-spi2-atk +, cairo +, cups +, dbus +, expat +, ffmpeg +, glib +, gtk3 +, libdrm +, libudev0-shim +, libxkbcommon +, mesa +, nspr +, nss +, pango +, xorg +}: + +let + id = "117980724"; +in +stdenvNoCC.mkDerivation rec { + pname = "multiviewer-for-f1"; + version = "1.24.1"; + + src = fetchurl { + url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; + sha256 = "sha256-uEcxDIWolouIUJ8Xuva3rtW51gfCddAwTGqOBnucmmY="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + ffmpeg + glib + gtk3 + libdrm + libxkbcommon + mesa + nspr + nss + pango + xorg.libX11 + xorg.libXcomposite + xorg.libxcb + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + runHook preUnpack + + # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here + dpkg --fsys-tarfile $src | tar --extract + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + mv -t $out/share usr/share/* usr/lib/multiviewer-for-f1 + + makeWrapper "$out/share/multiviewer-for-f1/MultiViewer for F1" $out/bin/multiviewer-for-f1 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libudev0-shim ]}:\"$out/share/Multiviewer for F1\"" + + runHook postInstall + ''; + + meta = with lib; { + description = "Unofficial desktop client for F1 TVĀ®"; + homepage = "https://multiviewer.app"; + downloadPage = "https://multiviewer.app/download"; + license = licenses.unfree; + maintainers = with maintainers; [ babeuh ]; + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f23ca4524ab5..20638b02c075 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31560,6 +31560,8 @@ with pkgs; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; + multiviewer-for-f1 = callPackage ../applications/video/multiviewer-for-f1 { }; + muzika = callPackage ../applications/audio/muzika { }; pattypan = callPackage ../applications/misc/pattypan {