ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #239666 from figsoda/deltachat

Browse Source 
deltachat-desktop: remove noop override
This commit is contained in:
Nick Cao 2023-06-26 20:32:23 +08:00 committed by GitHub
commit b29d695690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5849 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5827
pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

25
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View File

@ -5,7 +5,6 @@
, buildGoModule
, esbuild
, fetchFromGitHub
, fetchpatch
, libdeltachat
, makeDesktopItem
, makeWrapper
@ -13,31 +12,12 @@
, pkg-config
, python3
, roboto
, rustPlatform
, sqlcipher
, stdenv
, CoreServices
}:
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
version = "1.117.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-zKOhjV2q+jKoh5KVb+izbRzq0kAFp3pXdnPTf9PAhGs=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
"quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg=";
};
};
});
esbuild' = esbuild.override {
buildGoModule = args: buildGoModule (args // rec {
version = "0.14.54";
@ -50,7 +30,8 @@ let
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
};
in buildNpmPackage rec {
in
buildNpmPackage rec {
pname = "deltachat-desktop";
version = "1.38.1";
@ -72,7 +53,7 @@ in buildNpmPackage rec {
];
buildInputs = [
libdeltachat'
libdeltachat
] ++ lib.optionals stdenv.isDarwin [
CoreServices
];