diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-08-21 12:45:28 +0200 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-08-21 12:45:28 +0200 |
| commit | 10ba4b67e4892cccf629a64884980a25fa89b541 (patch) | |
| tree | d483f9de273df3341b97f8db39947eab05552c17 /pkgs/applications | |
| parent | 091eb25a793f4313845c4437b65a76dff5385c05 (diff) | |
| download | nixpkgs-10ba4b67e4892cccf629a64884980a25fa89b541.tar nixpkgs-10ba4b67e4892cccf629a64884980a25fa89b541.tar.gz nixpkgs-10ba4b67e4892cccf629a64884980a25fa89b541.tar.bz2 nixpkgs-10ba4b67e4892cccf629a64884980a25fa89b541.tar.lz nixpkgs-10ba4b67e4892cccf629a64884980a25fa89b541.tar.xz nixpkgs-10ba4b67e4892cccf629a64884980a25fa89b541.tar.zst nixpkgs-10ba4b67e4892cccf629a64884980a25fa89b541.zip | |
Emacs: Use gnutls instead of OpenSSL.
It looks like this error was introduced accidentally with 0132e1b. Emacs can't use openssl to make secure connections.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 329fa3a5626..3bfee481c9c 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, openssl +, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo , withX ? !stdenv.isDarwin, withGTK ? true }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin-new-sections.patch ]; buildInputs = - [ ncurses gconf libxml2 openssl alsaLib pkgconfig texinfo ] + [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft |