From 2ce47167bc264eb598a0cd03848603a73d6b8b07 Mon Sep 17 00:00:00 2001 From: Jedsek Date: Wed, 5 Apr 2023 21:15:12 +0800 Subject: [PATCH 1/2] maintainers: add jedsek --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7c786c0abe33..093755a13e8f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6985,6 +6985,12 @@ githubId = 17029738; name = "Jean-Charles Quillet"; }; + jedsek = { + email = "jedsek@qq.com"; + github = "jedsek"; + githubId = 63626406; + name = "Jedsek"; + }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; From c5a3aeba6fe5bd254334aa3119902d7c2487b110 Mon Sep 17 00:00:00 2001 From: Jedsek Date: Wed, 5 Apr 2023 21:13:50 +0800 Subject: [PATCH 2/2] bilibili: init at 1.9.2-1 --- pkgs/applications/video/bilibili/default.nix | 48 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/video/bilibili/default.nix diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix new file mode 100644 index 000000000000..c7c2b6faa7a2 --- /dev/null +++ b/pkgs/applications/video/bilibili/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, electron +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "bilibili"; + version = "1.9.2-1"; + src = fetchurl { + url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; + hash = "sha256-y3dUBImvcIG89m82RaIOa0cxJXIAIGa+n3FJkASacaY="; + }; + + unpackPhase = '' + runHook preUnpack + + ar x $src + tar xf data.tar.xz + + runHook postUnpack + ''; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + 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 \ + --argv0 "bilibili" \ + --add-flags "$out/opt/app.asar" + + runHook postInstall + ''; + + meta = with lib; { + description = "Electron-based bilibili desktop client"; + homepage = "https://github.com/msojocs/bilibili-linux"; + license = licenses.mit; + maintainers = with maintainers; [ jedsek ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ccad6f3ac12..c450a5ce498e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3802,6 +3802,8 @@ with pkgs; biliass = with python3.pkgs; toPythonApplication biliass; + bilibili = callPackage ../applications/video/bilibili { }; + bindfs = callPackage ../tools/filesystems/bindfs { }; binwalk = with python3Packages; toPythonApplication binwalk;