diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/applications/networking/mailreaders/meli | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/mailreaders/meli')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix index 1a6ae282a8dd..4f3a1ef3901f 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix @@ -8,6 +8,7 @@ , sqlite , file , gzip +, makeWrapper , notmuch # Build with support for notmuch backend , withNotmuch ? true @@ -15,19 +16,19 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "alpha-0.6.1"; + version = "alpha-0.6.2"; src = fetchgit { url = "https://git.meli.delivery/meli/meli.git"; rev = version; - sha256 = "0fs3wccbdfxf4nmx9l5wy7qpjk4r11qg0fc59y0pdvjrrslcjsds"; + sha256 = "0ycyksrrp4llwklzx3ipac8hmpfxa1pa7dqsm82wic0f6p5d1dp6"; }; - cargoSha256 = "sha256:19j7jrizp7yifmqwrmnv66pka7131jl7ks4zgs3nr5gbb28zvdrz"; + cargoSha256 = "sha256:0lxwhb2c16w5z7rqzch0ij8n8hxb5xcin31w9i28mzv1xm7sg8ks"; cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; - nativeBuildInputs = [ pkgconfig gzip ]; + nativeBuildInputs = [ pkgconfig gzip makeWrapper ]; buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; @@ -35,9 +36,17 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/share/man/man1 - gzip < meli.1 > $out/share/man/man1/meli.1.gz + gzip < docs/meli.1 > $out/share/man/man1/meli.1.gz mkdir -p $out/share/man/man5 - gzip < meli.conf.5 > $out/share/man/man5/meli.conf.5.gz + gzip < docs/meli.conf.5 > $out/share/man/man5/meli.conf.5.gz + gzip < docs/meli-themes.5 > $out/share/man/man5/meli-themes.5.gz + '' + lib.optionalString withNotmuch '' + # Fixes this runtime error when meli is started with notmuch configured: + # $ meli + # libnotmuch5 was not found in your system. Make sure it is installed and + # in the library paths. + # notmuch is not a valid mail backend + wrapProgram $out/bin/meli --set LD_LIBRARY_PATH ${notmuch}/lib ''; meta = with stdenv.lib; { |