Unverified Commit 3f200638 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #204027 from trofi/emacs-without-xlibsWrapper 

emacs: drop unused xlibsWrapper
parents 2a047233 8f88cd3f

pkgs/applications/editors/emacs/generic.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  , patches ? _: [ ]

  , macportVersion ? null

}:

{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, substituteAll, ncurses, xlibsWrapper, libXaw, libXpm

{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, substituteAll, ncurses, libXaw, libXpm

, Xaw3d, libXcursor,  pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib

, libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux

, alsa-lib, cairo, acl, gpm, m17n_lib, libotf
@@ -143,7 +143,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation 
    ++ lib.optionals stdenv.isLinux [ dbus libselinux alsa-lib acl gpm ]

    ++ lib.optionals withSystemd [ systemd ]

    ++ lib.optionals withX

      [ xlibsWrapper libXaw Xaw3d gconf cairo ]

      [ libXaw Xaw3d gconf cairo ]

    ++ lib.optionals (withX || withPgtk)

      [ libXpm libpng libjpeg giflib libtiff ]

    ++ lib.optionals (withX || withNS || withPgtk ) [ librsvg ]