alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

vaultwarden: fix the build for rustc 1.56

Browse source 
rustc 1.55 was ignoring vaultwarden's `rust-version = 1.57`, causing
the build to succeed. rustc 1.56 was erroring out because it does not
ignore the minimum `rust-version`.

Patch out the `rust-version` because we do not really need 1.57;
rustc 1.56 with RUSTC_BOOTSTRAP=1 produces a working vaultwarden.

This fixes https://github.com/NixOS/nixpkgs/issues/146215
This commit is contained in:
Ivan Kozik 2021-11-16 07:53:28 +00:00
parent 6b68d74f03
commit a153ef57e0
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/security/vaultwarden/default.nix
View file

@ -19,12 +19,20 @@ in rustPlatform.buildRustPackage rec {
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 ];
buildInputs = with lib; [ openssl ]
++ optionals stdenv.isDarwin [ libiconv Security CoreServices ]
++ optional (dbBackend == "mysql") libmysqlclient
++ 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;
cargoBuildFlags = [ featuresFlag ];
@ -42,6 +50,6 @@ in rustPlatform.buildRustPackage rec {
description = "Unofficial Bitwarden compatible server written in Rust";
homepage = "https://github.com/dani-garcia/vaultwarden";
license = licenses.gpl3Only;
maintainers = with maintainers; [ msteen ];
maintainers = with maintainers; [ msteen ivan ];
};
}