Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cc0b0e99a73b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43b4c840c7a3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 23, 2020

  1. emacs: Move toolkit to function arguments 

    It's possible to build Emacs without any toolkits which uses xlib.
    @adisbladis
    adisbladis committed May 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2b520b0 View commit details

  2. Merge pull request #88717 from adisbladis/emacs-x-toolkit 

    emacs: Move toolkit to function arguments
    @adisbladis
    adisbladis authored May 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    43b4c84 View commit details
Showing with 5 additions and 6 deletions.
  1. +5 −6 pkgs/applications/editors/emacs/default.nix
11 changes: 5 additions & 6 deletions pkgs/applications/editors/emacs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,10 @@
, withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
, siteStart ? ./site-start.el
, toolkit ? (
if withGTK2 then "gtk2"
else if withGTK3 then "gtk3"
else "lucid")
}:

assert (libXft != null) -> libpng != null; # probably a bug
@@ -23,12 +27,7 @@ assert withGTK2 -> !withGTK3 && gtk2-x11 != null;
assert withGTK3 -> !withGTK2 && gtk3-x11 != null;
assert withXwidgets -> withGTK3 && webkitgtk != null;

let
toolkit =
if withGTK2 then "gtk2"
else if withGTK3 then "gtk3"
else "lucid";
in

stdenv.mkDerivation rec {
name = "emacs-${version}${versionModifier}";
version = "26.3";