Merge pull request #330138 from dotlambda/deltachat-desktop
deltachat-desktop: don't depend on libdeltachat
This commit is contained in:
commit
3a2592ce1e
@ -7,7 +7,6 @@
|
||||
, fetchFromGitHub
|
||||
, jq
|
||||
, deltachat-rpc-server
|
||||
, libdeltachat
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, noto-fonts-color-emoji
|
||||
@ -51,8 +50,13 @@ buildNpmPackage rec {
|
||||
postPatch = ''
|
||||
test \
|
||||
$(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \
|
||||
= $(pkg-config --modversion deltachat) \
|
||||
|| (echo "error: libdeltachat version does not match jsonrpc-client" && exit 1)
|
||||
= ${deltachat-rpc-server.version} \
|
||||
|| (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
|
||||
|
||||
test \
|
||||
$(jq -r '.packages."node_modules/electron".version' package-lock.json | grep -E -o "^[0-9]+") \
|
||||
= ${lib.versions.major electron.version} \
|
||||
|| (echo 'error: electron version doesn not match package-lock.json' && exit 1)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -66,7 +70,6 @@ buildNpmPackage rec {
|
||||
|
||||
buildInputs = [
|
||||
deltachat-rpc-server
|
||||
libdeltachat
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user