summary refs log tree commit diff
diff options
context:
space:
mode:
authorlegendofmiracles <30902201+legendofmiracles@users.noreply.github.com>2022-01-05 11:39:22 -0600
committerGitHub <noreply@github.com>2022-01-05 11:39:22 -0600
commitdefafc9a220440180a34f923be9772d9c89a8197 (patch)
treecd4917f9c830055e131b43f0ace1387fdbd17e55
parent115a6f077fc29e7dc846618be86ece84c6d6aea7 (diff)
parenta76dcd5293dcb110f14e05f312fa86b19a2def56 (diff)
downloadnixpkgs-defafc9a220440180a34f923be9772d9c89a8197.tar
nixpkgs-defafc9a220440180a34f923be9772d9c89a8197.tar.gz
nixpkgs-defafc9a220440180a34f923be9772d9c89a8197.tar.bz2
nixpkgs-defafc9a220440180a34f923be9772d9c89a8197.tar.lz
nixpkgs-defafc9a220440180a34f923be9772d9c89a8197.tar.xz
nixpkgs-defafc9a220440180a34f923be9772d9c89a8197.tar.zst
nixpkgs-defafc9a220440180a34f923be9772d9c89a8197.zip
Merge pull request #136033 from wahjava/add-cinny
-rw-r--r--pkgs/applications/networking/instant-messengers/cinny/default.nix31
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix
new file mode 100644
index 00000000000..4c8f356cdf4
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }:
+
+let
+  configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
+in stdenv.mkDerivation rec {
+  pname = "cinny";
+  version = "1.6.1";
+
+  src = fetchurl {
+    url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
+    sha256 = "sha256-RJpLK16bedpqo/JJf3atpiuL5spHJNowomcusjZtEWA=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/
+    cp -R . $out/
+    ${jq}/bin/jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Yet another Matrix client for the web";
+    homepage = "https://cinny.in/";
+    maintainers = with maintainers; [ abbe ];
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c8559cfd78..418207ac15d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2504,6 +2504,8 @@ with pkgs;
 
   cht-sh = callPackage ../tools/misc/cht.sh { };
 
+  cinny = callPackage ../applications/networking/instant-messengers/cinny {};
+
   ckbcomp = callPackage ../tools/X11/ckbcomp { };
 
   clac = callPackage ../tools/misc/clac {};