From 6ac68a4c5929c0f3184067af20243829f804a631 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 13:05:16 +0000 Subject: [PATCH] sylpheed: cleanup --- .../networking/mailreaders/sylpheed/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 0f8b4f00c8b..ac7846836ff 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,8 +1,9 @@ -{ sslSupport ? true -, gpgSupport ? false -, stdenv, fetchurl, pkgconfig, gtk +{ stdenv, fetchurl, pkgconfig, gtk + , openssl ? null , gpgme ? null +, sslSupport ? true +, gpgSupport ? true }: with stdenv.lib; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09d620c3823..75106a639b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11793,10 +11793,7 @@ let swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { - sslSupport = true; - gpgSupport = true; - }; + sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; symlinks = callPackage ../tools/system/symlinks { };