From 083bcedfa91b6a2d3e0065d94ae4c00f14a36169 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Tue, 6 Aug 2024 21:59:35 +0800
Subject: [PATCH 1/5] bilibili: allow more arguments

---
 pkgs/by-name/bi/bilibili/package.nix | 31 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix
index b3f7a7b7adaa..9dc074667674 100644
--- a/pkgs/by-name/bi/bilibili/package.nix
+++ b/pkgs/by-name/bi/bilibili/package.nix
@@ -1,9 +1,11 @@
-{ lib
-, stdenv
-, fetchurl
-, electron
-, zstd
-, makeWrapper
+{
+  lib,
+  stdenv,
+  fetchurl,
+  electron,
+  zstd,
+  makeWrapper,
+  commandLineArgs ? "",
 }:
 
 stdenv.mkDerivation rec {
@@ -34,18 +36,25 @@ stdenv.mkDerivation rec {
     cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt
     makeWrapper ${electron}/bin/electron $out/bin/bilibili \
       --argv0 "bilibili" \
-      --add-flags "$out/opt/app.asar"
+      --add-flags "$out/opt/app.asar" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Electron-based bilibili desktop client";
     homepage = "https://github.com/msojocs/bilibili-linux";
-    license = with licenses; [ unfree mit ];
-    maintainers = with maintainers; [ jedsek kashw2 ];
+    license = with lib.licenses; [
+      unfree
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      jedsek
+      kashw2
+    ];
     platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     mainProgram = "bilibili";
   };
 }

From 964d6c6fe0efa1c6fde66cf49dc78d1598d05314 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 10 Aug 2024 08:57:35 +0800
Subject: [PATCH 2/5] bilibili: 1.14.0-1 -> 1.14.0-2; bilibili: unpack with
 dpkg

---
 pkgs/by-name/bi/bilibili/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix
index 9dc074667674..70a1ab0847a1 100644
--- a/pkgs/by-name/bi/bilibili/package.nix
+++ b/pkgs/by-name/bi/bilibili/package.nix
@@ -3,29 +3,29 @@
   stdenv,
   fetchurl,
   electron,
-  zstd,
+  dpkg,
   makeWrapper,
   commandLineArgs ? "",
 }:
 
 stdenv.mkDerivation rec {
   pname = "bilibili";
-  version = "1.14.0-1";
+  version = "1.14.0-2";
   src = fetchurl {
     url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
-    hash = "sha256-4+DGL/DNR3wLFUff17OquAM6dOkcsXFNeCqA7ITtCaI=";
+    hash = "sha256-QQMdEpKE7r/fPMaX/yEoaa7KjilhiPMYLRvGPkv1jds=";
   };
 
   unpackPhase = ''
     runHook preUnpack
-
-    ar x $src
-    tar -I ${zstd}/bin/zstd -xvf data.tar.zst
-
+    dpkg -x $src ./
     runHook postUnpack
   '';
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    dpkg
+  ];
 
   installPhase = ''
     runHook preInstall

From 8f0bfe093a30dbfd181759f85f4299eb1bfed21b Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 10 Aug 2024 09:05:09 +0800
Subject: [PATCH 3/5] bilibili: support aarch64-linux

---
 pkgs/by-name/bi/bilibili/package.nix | 29 ++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix
index 70a1ab0847a1..fc03dcc1d139 100644
--- a/pkgs/by-name/bi/bilibili/package.nix
+++ b/pkgs/by-name/bi/bilibili/package.nix
@@ -7,15 +7,25 @@
   makeWrapper,
   commandLineArgs ? "",
 }:
-
-stdenv.mkDerivation rec {
-  pname = "bilibili";
+let
   version = "1.14.0-2";
-  src = fetchurl {
-    url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
-    hash = "sha256-QQMdEpKE7r/fPMaX/yEoaa7KjilhiPMYLRvGPkv1jds=";
+  srcs = {
+    x86_64-linux = fetchurl {
+      url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
+      hash = "sha256-QQMdEpKE7r/fPMaX/yEoaa7KjilhiPMYLRvGPkv1jds=";
+    };
+    aarch64-linux = fetchurl {
+      url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_arm64.deb";
+      hash = "sha256-UaGI4BLhfoYluZpARsj+I0iEmFXYYNfl4JWhBWOOip0=";
+    };
   };
-
+  src =
+    srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+in
+stdenv.mkDerivation {
+  pname = "bilibili";
+  inherit src;
+  inherit version;
   unpackPhase = ''
     runHook preUnpack
     dpkg -x $src ./
@@ -53,7 +63,10 @@ stdenv.mkDerivation rec {
       jedsek
       kashw2
     ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     mainProgram = "bilibili";
   };

From 6498cc6cf5d270fc5cc80fb23848f6b572c83caf Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 14 Aug 2024 21:46:48 +0800
Subject: [PATCH 4/5] bilibili: add bot-wxt1221 as maintainer

---
 pkgs/by-name/bi/bilibili/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix
index fc03dcc1d139..b66c25485736 100644
--- a/pkgs/by-name/bi/bilibili/package.nix
+++ b/pkgs/by-name/bi/bilibili/package.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       jedsek
       kashw2
+      bot-wxt1221
     ];
     platforms = [
       "x86_64-linux"

From c671a808fedf18c4fac6f4057547ffc1ce765517 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 24 Aug 2024 23:03:54 +0800
Subject: [PATCH 5/5] bilibili: switch to electron_30

---
 pkgs/by-name/bi/bilibili/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix
index b66c25485736..14b3e0348370 100644
--- a/pkgs/by-name/bi/bilibili/package.nix
+++ b/pkgs/by-name/bi/bilibili/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  electron,
+  electron_30,
   dpkg,
   makeWrapper,
   commandLineArgs ? "",
@@ -24,8 +24,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "bilibili";
-  inherit src;
-  inherit version;
+  inherit src version;
   unpackPhase = ''
     runHook preUnpack
     dpkg -x $src ./
@@ -44,7 +43,7 @@ stdenv.mkDerivation {
     cp -r usr/share $out/share
     sed -i "s|Exec=.*|Exec=$out/bin/bilibili|" $out/share/applications/*.desktop
     cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt
-    makeWrapper ${electron}/bin/electron $out/bin/bilibili \
+    makeWrapper ${lib.getExe electron_30} $out/bin/bilibili \
       --argv0 "bilibili" \
       --add-flags "$out/opt/app.asar" \
       --add-flags ${lib.escapeShellArg commandLineArgs}