From 701f1c4c55be8ac28bf8fd5acf9d3bb6f047248b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 9 Jan 2022 00:34:32 +0100 Subject: [PATCH] gnome.gnome-shell: switch to non-full asciidoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The full variant does not seem to be actually needed, allowing us to prune Java from the build closure. In fact, the AsciiDoc/a2x tool is not actually used at all when building from tarball because it contains a pre-generated copy of the manual page. Let’s remove the pregenerated file so that building from tarball is more consistent with the VCS build (e.g. when testing new versions or patches). --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 5e03551dceca..5de52723d007 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -55,7 +55,7 @@ , gnome-clocks , gnome-settings-daemon , gnome-autoar -, asciidoc-full +, asciidoc , bash-completion , mesa }: @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { desktop-file-utils libxslt.bin python3 - asciidoc-full + asciidoc ]; buildInputs = [ @@ -180,6 +180,9 @@ stdenv.mkDerivation rec { chmod +x meson/postinstall.py patchShebangs meson/postinstall.py + # We can generate it ourselves. + rm -f man/gnome-shell.1 + substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" '';