jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
emacs: Move toolkit to function arguments
This commit is contained in:
adisbladis 2020-05-24 00:35:41 +02:00 committed by GitHub
commit 43b4c840c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/editors/emacs/default.nix
View File

@ -11,6 +11,10 @@
, withCsrc ? true , withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
, siteStart ? ./site-start.el , siteStart ? ./site-start.el
, toolkit ? (
if withGTK2 then "gtk2"
else if withGTK3 then "gtk3"
else "lucid")
}: }:
assert (libXft != null) -> libpng != null; # probably a bug 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 withGTK3 -> !withGTK2 && gtk3-x11 != null;
assert withXwidgets -> withGTK3 && webkitgtk != null; assert withXwidgets -> withGTK3 && webkitgtk != null;
let
toolkit =
if withGTK2 then "gtk2"
else if withGTK3 then "gtk3"
else "lucid";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emacs-${version}${versionModifier}"; name = "emacs-${version}${versionModifier}";
version = "26.3"; version = "26.3";