about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Ramsden <johnramsden@users.noreply.github.com>2017-07-05 16:28:01 -0700
committerJohn Ramsden <johnramsden@users.noreply.github.com>2017-07-05 16:28:01 -0700
commit407324faa9b1a4a0641cb1146cc910328210ab6e (patch)
tree0f99e38b1ce92238e41e0698f9a1c906b27a92b9
parent8181b075bac51fbce46a7b4d52e339b429f1250a (diff)
downloadnixlib-407324faa9b1a4a0641cb1146cc910328210ab6e.tar
nixlib-407324faa9b1a4a0641cb1146cc910328210ab6e.tar.gz
nixlib-407324faa9b1a4a0641cb1146cc910328210ab6e.tar.bz2
nixlib-407324faa9b1a4a0641cb1146cc910328210ab6e.tar.lz
nixlib-407324faa9b1a4a0641cb1146cc910328210ab6e.tar.xz
nixlib-407324faa9b1a4a0641cb1146cc910328210ab6e.tar.zst
nixlib-407324faa9b1a4a0641cb1146cc910328210ab6e.zip
Rename nylas-mail to nylas-mail-bin.
Change pkg in module, and name in pkg.
-rw-r--r--nixos/modules/programs/nylas-mail.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix (renamed from pkgs/applications/networking/mailreaders/nylas-mail/default.nix)4
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix
index fc18a9a4760b..9a6cf755f2a2 100644
--- a/nixos/modules/programs/nylas-mail.nix
+++ b/nixos/modules/programs/nylas-mail.nix
@@ -27,7 +27,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [pkgs.nylas-mail];
+    environment.systemPackages = [ pkgs.nylas-mail-bin ];
 
     services.gnome3.gnome-keyring = mkIf cfg.gnome3-keyring {
       enable = true;
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
index b9d4be3e3801..4c768325fee9 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation rec {
   name = "${pkgname}-${version}";
-  pkgname = "nylas-mail";
+  pkgname = "nylas-mail-bin";
   version = "2.0.32";
   subVersion = "fec7941";
 
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Open-source mail client built on the modern web with Electron, React, and Flux";
     longDescription = ''
-      Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. To run nylas-mail, an additional manual step is required. Make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup".
+      Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. Nylas Mail can be enabled with it's requirements by enabling 'services.nylas-mail.enable=true'. Alternatively, make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup".
     '';
     license = licenses.gpl3;
     maintainers = with maintainers; [ johnramsden ];