Merge pull request #146217 from ivan/vaultwarden-rustc-1.56
This commit is contained in:
commit
fd19aedbae
1 changed files with 9 additions and 1 deletions
|
@ -19,12 +19,20 @@ in rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
cargoSha256 = "sha256-ViXpoPkBznB0o/dc/l1r3m0y+z2w58wqlU8/cg8u7tI=";
|
cargoSha256 = "sha256-ViXpoPkBznB0o/dc/l1r3m0y+z2w58wqlU8/cg8u7tI=";
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working
|
||||||
|
# vaultwarden when using RUSTC_BOOTSTRAP=1
|
||||||
|
sed -ri 's/^rust-version = .*//g' Cargo.toml
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = with lib; [ openssl ]
|
buildInputs = with lib; [ openssl ]
|
||||||
++ optionals stdenv.isDarwin [ libiconv Security CoreServices ]
|
++ optionals stdenv.isDarwin [ libiconv Security CoreServices ]
|
||||||
++ optional (dbBackend == "mysql") libmysqlclient
|
++ optional (dbBackend == "mysql") libmysqlclient
|
||||||
++ optional (dbBackend == "postgresql") postgresql;
|
++ optional (dbBackend == "postgresql") postgresql;
|
||||||
|
|
||||||
|
# vaultwarden depends on rocket v0.5.0-dev, which requires nightly features.
|
||||||
|
# This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed.
|
||||||
RUSTC_BOOTSTRAP = 1;
|
RUSTC_BOOTSTRAP = 1;
|
||||||
|
|
||||||
cargoBuildFlags = [ featuresFlag ];
|
cargoBuildFlags = [ featuresFlag ];
|
||||||
|
@ -42,6 +50,6 @@ in rustPlatform.buildRustPackage rec {
|
||||||
description = "Unofficial Bitwarden compatible server written in Rust";
|
description = "Unofficial Bitwarden compatible server written in Rust";
|
||||||
homepage = "https://github.com/dani-garcia/vaultwarden";
|
homepage = "https://github.com/dani-garcia/vaultwarden";
|
||||||
license = licenses.gpl3Only;
|
license = licenses.gpl3Only;
|
||||||
maintainers = with maintainers; [ msteen ];
|
maintainers = with maintainers; [ msteen ivan ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue