File tree Expand file tree Collapse file tree 3 files changed +21
-7174
lines changed Expand file tree Collapse file tree 3 files changed +21
-7174
lines changed Original file line number Diff line number Diff line change 99, pkg-config
1010, pnpm_9
1111, python3
12+ , rustPlatform
1213, stdenv
1314, darwin
1415, testers
1718} :
1819
1920let
21+ deltachat-rpc-server' = deltachat-rpc-server . overrideAttrs rec {
22+ version = "1.148.7" ;
23+ src = fetchFromGitHub {
24+ owner = "deltachat" ;
25+ repo = "deltachat-core-rust" ;
26+ rev = "v${ version } " ;
27+ hash = "sha256-mTNWSR4ea972tIOvg6RClEc44mKXoHDEWoLZXio8O4k=" ;
28+ } ;
29+ cargoDeps = rustPlatform . fetchCargoVendor {
30+ pname = "deltachat-core-rust" ;
31+ inherit version src ;
32+ hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=" ;
33+ } ;
34+ } ;
2035 electron = electron_32 ;
2136 pnpm = pnpm_9 ;
2237in
@@ -47,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
4762 copyDesktopItems
4863 ] ;
4964
50- buildInputs = [
51- deltachat-rpc-server
52- ] ++ lib . optionals stdenv . hostPlatform . isDarwin [
65+ buildInputs = lib . optionals stdenv . hostPlatform . isDarwin [
5366 darwin . apple_sdk . frameworks . CoreServices
5467 ] ;
5568
@@ -63,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
6376
6477 test \
6578 $(yq -r '.catalogs.default."@deltachat/jsonrpc-client".version' pnpm-lock.yaml) \
66- = ${ deltachat-rpc-server . version } \
79+ = ${ deltachat-rpc-server' . version } \
6780 || (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
6881
6982 test \
@@ -83,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
8396
8497 pushd packages/target-electron/dist/*-unpacked/resources/app.asar.unpacked
8598 rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server
86- ln -s ${ lib . getExe deltachat-rpc-server } node_modules/@deltachat/stdio-rpc-server-*
99+ ln -s ${ lib . getExe deltachat-rpc-server' } node_modules/@deltachat/stdio-rpc-server-*
87100 popd
88101
89102 runHook postBuild
You can’t perform that action at this time.
0 commit comments