JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Emacs: Use gnutls instead of OpenSSL.

Browse Source 
It looks like this error was introduced accidentally with 0132e1b. Emacs
can't use openssl to make secure connections.
This commit is contained in:
Moritz Ulrich 2014-08-21 12:45:28 +02:00
parent 091eb25a79
commit 10ba4b67e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs-24/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, openssl , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib, cairo , alsaLib, cairo
, withX ? !stdenv.isDarwin, withGTK ? true , withX ? !stdenv.isDarwin, withGTK ? true
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patches = [ ./darwin-new-sections.patch ]; patches = [ ./darwin-new-sections.patch ];
buildInputs = buildInputs =
[ ncurses gconf libxml2 openssl alsaLib pkgconfig texinfo ] [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ]
++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optional stdenv.isLinux dbus
++ stdenv.lib.optionals withX ++ stdenv.lib.optionals withX
[ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft