final: prev: {
  emacs = (prev.emacs.override {
    withXwidgets = false;
    withX = true;
    withGTK3 = false;
    withAthena = false;
  }).overrideAttrs (attrs: with builtins; with attrs; {
    configureFlags = filter (f: !elem f
      ["--with-x-toolkit=lucid" "--with-toolkit-scroll-bars"])
      configureFlags ++ ["--with-x-toolkit=no" "--without-toolkit-scroll-bars"];
    version = "31.0.50";
    patches = patches ++ [./emacs-alpha-dividers.patch];
    src = prev.fetchFromSavannah {
      repo = "emacs";
      rev = "abcc099c732489354f8f2be70b9a919fffeb3d84";
      hash = "sha256-uOF881PUJ54OHnITU5a9ftuxyS9YbatYXPKOEfZYmPA=";
    };
  });
}