diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-08-11 22:00:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 22:00:11 +0200 |
| commit | 43965fdc371f8f2404ce67bdce929698d7b083ae (patch) | |
| tree | 5e1a09d0e5055af511d4a6b6003b6d5a2446f079 | |
| parent | 889ffd29620ef76aae6707ab37ecf6c4b2e362eb (diff) | |
| parent | 712af312579dd80a88329ebeafd89bfa7f2a63f5 (diff) | |
Merge pull request #185427 from aveltras/master
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix | 46 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 54 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c35d0df8f056..253691fb2c6a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1273,6 +1273,12 @@ githubId = 1217745; name = "Aldwin Vlasblom"; }; + aveltras = { + email = "romain.viallard@outlook.fr"; + github = "aveltras"; + githubId = 790607; + name = "Romain Viallard"; + }; avery = { email = "averyl+nixos@protonmail.com"; github = "AveryLychee"; diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix new file mode 100644 index 000000000000..c6d135a02892 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, dpkg +, fetchurl +, autoPatchelfHook +, glib-networking +, openssl +, webkitgtk +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "cinny-desktop"; + version = "2.1.1"; + + src = fetchurl { + url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; + sha256 = "sha256-4jd+N3a+u+c+XLwgr8BvvdkVLzo+xTBKFdjiQeu7NJU="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + glib-networking + openssl + webkitgtk + wrapGAppsHook + ]; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + installPhase = "mv usr $out"; + + meta = with lib; { + description = "Yet another matrix client for desktop"; + homepage = "https://github.com/cinnyapp/cinny-desktop"; + maintainers = [ maintainers.aveltras ]; + license = licenses.mit; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.linux; + mainProgram = "cinny"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e343708626f..b0ad84a9e997 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3186,6 +3186,8 @@ with pkgs; cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; }; + cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { }; + ckbcomp = callPackage ../tools/X11/ckbcomp { }; clac = callPackage ../tools/misc/clac {}; |