nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #263790 from pbsds/bump-cinny-1698414235

Browse Source 
cinny: 3.0.0 -> 3.1.0
This commit is contained in:
Weijia Wang 2023-10-28 15:04:48 +02:00 committed by GitHub
commit a8b5c2ba2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3678 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3660
pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

20
pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix
View File

@ -9,28 +9,37 @@
, dbus
, glib
, glib-networking
, libayatana-appindicator
, webkitgtk
, makeDesktopItem
}:
rustPlatform.buildRustPackage rec {
pname = "cinny-desktop";
version = "2.2.6";
version = "3.1.0";
src = fetchFromGitHub {
owner = "cinnyapp";
repo = "cinny-desktop";
rev = "v${version}";
hash = "sha256-RW6LeItIAHJk1e7qMa1MLIGb3jHvJ/KM8E9l1qR48w8=";
hash = "sha256-v5D0/EHVQ2xo7TGo+jZoRDBVFczkaZu2ka6QpwV4dpw=";
};
sourceRoot = "${src.name}/src-tauri";
cargoHash = "sha256-Iab/icQ9hFVh/o6egZVPa2zeKgO5WxzkluhRckcayvw=";
# modififying $cargoDepsCopy requires the lock to be vendored
cargoLock.lockFile = ./Cargo.lock;
postPatch = ''
postPatch = let
cinny' =
assert lib.assertMsg (cinny.version == version) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})";
cinny;
in ''
substituteInPlace tauri.conf.json \
--replace '"distDir": "../cinny/dist",' '"distDir": "${cinny}",'
--replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",'
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
'';
postInstall = ''
@ -50,6 +59,7 @@ rustPlatform.buildRustPackage rec {
dbus
glib
glib-networking
libayatana-appindicator
webkitgtk
];

6
pkgs/applications/networking/instant-messengers/cinny/default.nix
View File

@ -18,16 +18,16 @@ let
in
buildNpmPackage rec {
pname = "cinny";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "cinnyapp";
repo = "cinny";
rev = "v${version}";
hash = "sha256-BFovEmT4RgdzlSYi1p0324PW7+2rvw3n5+jKWTV2FF4=";
hash = "sha256-GcygxK9NcGlv4rwxQCJqi0BhNlOTFxjGB8mbfTaBMOk=";
};
npmDepsHash = "sha256-E+VBs66chBeiK40DZZ1hWTTISKaBN1RA+Uyr1iHqfus=";
npmDepsHash = "sha256-4R+To2LhcnEM9x1noo6MhCckyBKgPWiAi7zgDqAmaN0=";
nativeBuildInputs = [
jq