From 4ccfc2bfaf0602f8ce383b7fa7b6427042223ba8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 8 Sep 2025 18:55:42 +0200 Subject: [PATCH 1/2] emacs: remove unused parameters --- pkgs/applications/editors/emacs/make-emacs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index e3a882b1afb1..609af6c3ea39 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -62,7 +62,6 @@ texinfo, webkitgtk_4_0, wrapGAppsHook3, - writeText, zlib, # Boolean flags From fb4f042147831e9fc362f9001d11c9ebc592a1d9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 8 Sep 2025 18:56:20 +0200 Subject: [PATCH 2/2] emacs: replace `systemd` with `systemdLibs` --- pkgs/applications/editors/emacs/make-emacs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 609af6c3ea39..523210b93b80 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -57,7 +57,7 @@ sigtool, sqlite, replaceVars, - systemd, + systemdLibs, tree-sitter, texinfo, webkitgtk_4_0, @@ -87,7 +87,7 @@ withPgtk ? false, withSelinux ? stdenv.hostPlatform.isLinux, withSQLite3 ? true, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs, withToolkitScrollBars ? true, withTreeSitter ? true, withWebP ? true, @@ -321,7 +321,7 @@ stdenv.mkDerivation (finalAttrs: { sqlite ] ++ lib.optionals withSystemd [ - systemd + systemdLibs ] ++ lib.optionals withTreeSitter [ tree-sitter