diff --git a/flake.nix b/flake.nix index ad6ecbd0f..9920bf914 100644 --- a/flake.nix +++ b/flake.nix @@ -268,6 +268,7 @@ "scripts/wheel-rpc-server.py" "deltachat-rpc-server/README.md" "LICENSE" + "Cargo.toml" ]; }; nativeBuildInputs = [ @@ -280,7 +281,7 @@ buildPhase = '' mkdir tmp cp ${rpc-server}/bin/deltachat-rpc-server tmp/deltachat-rpc-server - python3 scripts/wheel-rpc-server.py ${manifest.version} ${arch} tmp/deltachat-rpc-server + python3 scripts/wheel-rpc-server.py ${arch} tmp/deltachat-rpc-server ''; installPhase = ''mkdir -p $out; cp -av deltachat_rpc_server-*.whl $out''; }; @@ -311,6 +312,7 @@ "scripts/wheel-rpc-server.py" "deltachat-rpc-server/README.md" "LICENSE" + "Cargo.toml" ]; }; nativeBuildInputs = [ @@ -323,7 +325,7 @@ buildPhase = '' mkdir tmp cp ${deltachat-rpc-server-win64}/bin/deltachat-rpc-server.exe tmp/deltachat-rpc-server.exe - python3 scripts/wheel-rpc-server.py ${manifest.version} win64 tmp/deltachat-rpc-server.exe + python3 scripts/wheel-rpc-server.py win64 tmp/deltachat-rpc-server.exe ''; installPhase = ''mkdir -p $out; cp -av deltachat_rpc_server-*.whl $out''; }; @@ -340,6 +342,7 @@ "scripts/wheel-rpc-server.py" "deltachat-rpc-server/README.md" "LICENSE" + "Cargo.toml" ]; }; nativeBuildInputs = [ @@ -352,7 +355,7 @@ buildPhase = '' mkdir tmp cp ${deltachat-rpc-server-win32}/bin/deltachat-rpc-server.exe tmp/deltachat-rpc-server.exe - python3 scripts/wheel-rpc-server.py ${manifest.version} win32 tmp/deltachat-rpc-server.exe + python3 scripts/wheel-rpc-server.py win32 tmp/deltachat-rpc-server.exe ''; installPhase = ''mkdir -p $out; cp -av deltachat_rpc_server-*.whl $out''; }; @@ -405,7 +408,7 @@ pkgs.python3 pkgs.python3Packages.wheel ]; - buildPhase = ''python3 scripts/wheel-rpc-server.py ${manifest.version} source deltachat-rpc-server-${manifest.version}.tar.gz''; + buildPhase = ''python3 scripts/wheel-rpc-server.py source deltachat-rpc-server-${manifest.version}.tar.gz''; installPhase = ''mkdir -p $out; cp -av deltachat-rpc-server-${manifest.version}.tar.gz $out''; }; diff --git a/scripts/wheel-rpc-server.py b/scripts/wheel-rpc-server.py index 57d6a8004..8289a826c 100755 --- a/scripts/wheel-rpc-server.py +++ b/scripts/wheel-rpc-server.py @@ -163,13 +163,15 @@ arch2tags = { def main(): - version = sys.argv[1] - if sys.argv[2] == "source": + with Path("Cargo.toml").open("rb") as fp: + cargo_manifest = tomllib.load(fp) + version = cargo_manifest["package"]["version"] + if sys.argv[1] == "source": filename = f"deltachat-rpc-server-{version}.tar.gz" build_source_package(version, filename) else: - arch = sys.argv[2] - executable = sys.argv[3] + arch = sys.argv[1] + executable = sys.argv[2] tags = arch2tags[arch] if arch in ["win32", "win64"]: