Commit 1beeb6bc authored by Lin Jian's avatar Lin Jian
Browse files

emacs: lift withXwidgets constraint 

Recently, upstream Emacs re-enabled[1] withXidgets.

Following that change, we update the default value for withXwidgets to
false only for Emacs 30 so that other versions of Emacs will enable
withXwidgets by default.  In addition, we stop setting meta.broken
with withXwidgets, which makes it easier for users to enable
withXwidgets for Emacs 30 by cherry-picking the upstream patch[1].

[1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=80728
parent e1b49e16

pkgs/applications/editors/emacs/make-emacs.nix

+3 −3
Original line number Diff line number Diff line
@@ -97,9 +97,10 @@ 
  withXwidgets ?

    !noGui

    && (withGTK3 || withPgtk || withNS || variant == "macport")

    && (stdenv.hostPlatform.isDarwin || lib.versionOlder version "30"),

    && (stdenv.hostPlatform.isDarwin || lib.versions.major version != "30"),

  # XXX: - upstream bug 66068 precludes newer versions of webkit2gtk (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html)

  # XXX: - Apple_SDK WebKit is compatible with Emacs.

  # XXX: - upstream bug 80728 lifts the webkit2gtk version check added in upstream bug 66068

  withSmallJaDic ? false,

  withCompressInstall ? true,
@@ -505,8 +506,7 @@ stdenv.mkDerivation (finalAttrs: { 
  };



  meta = {

    broken =

      (withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) || withWebkitgtk;

    broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);

  }

  // meta;

})