diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-02-12 21:15:48 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-16 14:06:10 +0000 |
commit | 6e3b5fd04622b4740ba10eb557d1aae1b835049d (patch) | |
tree | 3ab24d18019cc6f44ffbca7209887cd61ca13011 /pkgs/applications/editors/emacs/generic.nix | |
parent | 451d9d6f8ec63129fb518180ab72b7e88b596dd0 (diff) |
libungif: remove in favour of giflib
libungif was merged into giflib in 2006, and hasn't been updated since. All non-broken packages still using it build fine with giflib. See <http://giflib.sourceforge.net/history.html>.
Diffstat (limited to 'pkgs/applications/editors/emacs/generic.nix')
-rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 6726790d50fe8..b093c7e0529d1 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -7,7 +7,7 @@ , patches ? [ ] }: { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm -, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, libungif +, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz @@ -108,7 +108,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext jansson harfbuzz.dev ] ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX - [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft gconf cairo ] ++ lib.optionals (withX || withNS) [ librsvg ] ++ lib.optionals withImageMagick [ imagemagick ] |