From be8129be330d6f21d7ff1dfe41dd53d0388e49a8 Mon Sep 17 00:00:00 2001 From: Hutzdog Date: Sat, 10 Apr 2021 14:59:02 -0700 Subject: [PATCH 1/2] maintainers: add enderger --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 969d6ab338e..09fe165cac2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2731,6 +2731,12 @@ githubId = 18535642; name = "Emily"; }; + enderger = { + email = "endergeryt@gmail.com"; + github = "enderger"; + githubId = 36283171; + name = "Daniel"; + }; endocrimes = { email = "dani@builds.terrible.systems"; github = "endocrimes"; From 6a6d2df62ae66f87bea632cd7f812392fecdf294 Mon Sep 17 00:00:00 2001 From: Hutzdog Date: Mon, 12 Apr 2021 18:52:23 -0700 Subject: [PATCH 2/2] lbry: init at 0.50.2 --- pkgs/applications/video/lbry/default.nix | 49 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/video/lbry/default.nix diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix new file mode 100644 index 00000000000..479616ee3ef --- /dev/null +++ b/pkgs/applications/video/lbry/default.nix @@ -0,0 +1,49 @@ +{ lib, fetchurl, appimageTools}: + +let + pname = "lbry-desktop"; + version = "0.50.2"; +in appimageTools.wrapAppImage rec { + name = "${pname}-${version}"; + + # Fetch from GitHub Releases and extract + src = appimageTools.extract { + inherit name; + src = fetchurl { + url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; + # Gotten from latest-linux.yml + sha512 = "br6HvVRz+ybmAhmQh3vOC5wgLmOCVrGHDn59ueWk6rFoKOCbm8WdmdadOZvHeN1ld2nlvPzEy+KXMOEfF1LeQg=="; + }; + }; + + # At runtime, Lbry likes to have access to Ffmpeg + extraPkgs = pkgs: with pkgs; [ + ffmpeg + ]; + + # General fixup + extraInstallCommands = '' + # Firstly, rename the executable to lbry for convinence + mv $out/bin/${name} $out/bin/lbry + + # Now, install assets such as the desktop file and icons + install -m 444 -D ${src}/lbry.desktop -t $out/share/applications + substituteInPlace $out/share/applications/lbry.desktop \ + --replace 'AppRun' '$out/bin/lbry' + cp -r ${src}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A browser and wallet for LBRY, the decentralized, user-controlled content marketplace"; + longDescription = '' + The LBRY app is a graphical browser for the decentralized content marketplace provided by the LBRY protocol. + It is essentially the lbry daemon bundled with a UI using Electron. + ''; + license = licenses.mit; + homepage = "https://lbry.com/"; + downloadPage = "https://lbry.com/get/"; + changelog = "https://github.com/lbryio/lbry-desktop/blob/master/CHANGELOG.md"; + maintainers = with maintainers; [ enderger ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 613b9ffc57e..53427ebdd88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24044,6 +24044,8 @@ in lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; + lbry = callPackage ../applications/video/lbry { }; + lbzip2 = callPackage ../tools/compression/lbzip2 { }; lci = callPackage ../applications/science/logic/lci {};