diff options
author | Vladimír Čunát <v@cunat.cz> | 2024-03-13 00:36:34 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2024-03-13 00:36:34 +0100 |
commit | cd20c0c426cc7d5cbba6fdeeda19166787809500 (patch) | |
tree | e96c0a1fa0704b5807b4b202dd0cf3403a345f8e /pkgs/applications/editors/emacs/make-emacs.nix | |
parent | 14feac318eefa31d936d9b6a2aacb1928899abfe (diff) | |
parent | 20eae76661fb92857beb6f56141ab5469da22d7b (diff) | |
download | nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.gz nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.bz2 nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.lz nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.xz nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.zst nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.zip |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/applications/editors/emacs/make-emacs.nix')
-rw-r--r-- | pkgs/applications/editors/emacs/make-emacs.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index c48550f8680a..a52533564616 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -68,6 +68,7 @@ , withAlsaLib ? false , withAthena ? false , withCsrc ? true +, withDbus ? stdenv.isLinux , withGTK2 ? false , withGTK3 ? withPgtk && !noGui , withGconf ? false @@ -77,6 +78,7 @@ , withMotif ? false , withNS ? stdenv.isDarwin && !(variant == "macport" || noGui) , withPgtk ? false +, withSelinux ? stdenv.isLinux , withSQLite3 ? lib.versionAtLeast version "29" , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withToolkitScrollBars ? true @@ -227,8 +229,9 @@ mkDerivation (finalAttrs: { alsa-lib ] ++ lib.optionals withGpm [ gpm - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals withDbus [ dbus + ] ++ lib.optionals withSelinux [ libselinux ] ++ lib.optionals (!stdenv.isDarwin && withGTK3) [ gsettings-desktop-schemas @@ -338,6 +341,8 @@ mkDerivation (finalAttrs: { (lib.withFeature withTreeSitter "tree-sitter") (lib.withFeature withXinput2 "xinput2") (lib.withFeature withXwidgets "xwidgets") + (lib.withFeature withDbus "dbus") + (lib.withFeature withSelinux "selinux") ]; env = lib.optionalAttrs withNativeCompilation { |