From 8544de565e6fb2efae3fd36e57f6ab6a2f7a3769 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 11 Nov 2021 18:26:59 -0600 Subject: [PATCH 1/2] indigenous-desktop: init at 1.2.0 --- .../indigenous-desktop/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix diff --git a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix new file mode 100644 index 000000000000..ca39a91fd2a3 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchurl, unzip, makeDesktopItem, copyDesktopItems +, makeWrapper, electron }: + +stdenv.mkDerivation rec { + pname = "indigenous-desktop"; + version = "1.2.0"; + + src = fetchurl { + url = "https://github.com/marksuth/indigenous-desktop/releases/download/v${version}/Indigenous-for-desktop-Linux-x64-${version}.zip"; + sha256 = "sha256-AXbLSmeKerDKv6ogm7fNh3cXYVmj1A6L2aK3WnMO8wU="; + }; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + unzip + ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "indigenous-desktop"; + icon = "indigenous-desktop"; + comment = meta.description; + desktopName = "Indigenous"; + genericName = "Feed Reader"; + }) + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt/indigenous $out/share/indigenous $out/share/pixmaps + cp -r ./ $out/opt/indigenous + mv $out/opt/indigenous/{locales,resources} $out/share/indigenous + mv $out/share/indigenous/resources/app/images/icon.png $out/share/pixmaps/indigenous-desktop.png + + makeWrapper ${electron}/bin/electron $out/bin/indigenous-desktop \ + --add-flags $out/share/indigenous/resources/app + + runHook postInstall + ''; + + meta = with lib; { + description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints"; + homepage = "https://indigenous.realize.be/indigenous-desktop"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d40cfb6b94ac..1c7762fbd82b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25549,6 +25549,10 @@ with pkgs; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; + indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { + electron = electron_9; + }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { ocamlPackages = ocaml-ng.ocamlPackages_4_08; }; From 8f76cb12c172106ff1070b1994bc040449fcf9d9 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 11 Nov 2021 18:33:14 -0600 Subject: [PATCH 2/2] indigenous-desktop: init at 1.3.0 --- .../networking/feedreaders/indigenous-desktop/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix index ca39a91fd2a3..9bb34ffbbd70 100644 --- a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix +++ b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "indigenous-desktop"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://github.com/marksuth/indigenous-desktop/releases/download/v${version}/Indigenous-for-desktop-Linux-x64-${version}.zip"; - sha256 = "sha256-AXbLSmeKerDKv6ogm7fNh3cXYVmj1A6L2aK3WnMO8wU="; + url = "https://github.com/marksuth/indigenous-desktop/releases/download/v${version}/indigenous-linux-x64-${version}.zip"; + sha256 = "sha256-1nqj9N5RQE0PogJSULu75CTVLHeQsHIimtFXSCP6SPA="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c7762fbd82b..254763ed4e3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25549,9 +25549,7 @@ with pkgs; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; - indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { - electron = electron_9; - }; + indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { }; jackline = callPackage ../applications/networking/instant-messengers/jackline { ocamlPackages = ocaml-ng.ocamlPackages_4_08;