1 files changed, 10 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
index e90eaed94f56..e200148cc076 100644
--- a/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -8,47 +8,32 @@
 , installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
 , notmuch
 , gpgme
-, withMaildir ? true
-, withImap ? true
-, withNotmuch ? false
-, withSendmail ? true
-, withSmtp ? true
-, withPgpCommands ? false
-, withPgpGpg ? false
-, withPgpNative ? false
+, buildNoDefaultFeatures ? false
+, buildFeatures ? []
 }:
 
 rustPlatform.buildRustPackage rec {
+  inherit buildNoDefaultFeatures buildFeatures;
+
   pname = "himalaya";
-  version = "1.0.0-beta";
+  version = "1.0.0-beta.2";
 
   src = fetchFromGitHub {
     owner = "soywod";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-39XYtxmo/12hkCS7zVIQi3UbLzaIKH1OwfdDB/ghU98=";
+    hash = "sha256-dLj/bEPz3SD1v54yXbtVdUJKQsyw0OJxmQh10ql+3iI=";
   };
 
-  cargoSha256 = "HIDmBPrcOcK2coTaD4v8ntIZrv2SwTa8vUTG8Ky4RhM=";
+  cargoSha256 = "0IYpuKq5amAcYtsDMzJGghbxkuldAulsgUmChTl2DIg=";
 
   nativeBuildInputs = [ ]
-    ++ lib.optional withPgpGpg pkg-config
+    ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) pkg-config
     ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
 
   buildInputs = [ ]
-    ++ lib.optional withNotmuch notmuch
-    ++ lib.optional withPgpGpg gpgme;
-
-  buildNoDefaultFeatures = true;
-  buildFeatures = [ ]
-    ++ lib.optional withMaildir "maildir"
-    ++ lib.optional withImap "imap"
-    ++ lib.optional withNotmuch "notmuch"
-    ++ lib.optional withSmtp "smtp"
-    ++ lib.optional withSendmail "sendmail"
-    ++ lib.optional withPgpCommands "pgp-commands"
-    ++ lib.optional withPgpGpg "pgp-gpg"
-    ++ lib.optional withPgpNative "pgp-native";
+    ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch
+    ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme;
 
   postInstall = lib.optionalString installManPages ''
     mkdir -p $out/man