diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-01-10 01:26:05 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-01-10 01:26:05 +0100 |
| commit | f7aa55946bc2d3a61c819086099d658dcc1b2c1e (patch) | |
| tree | 141644e158e35b05f2b2fd8442cff551db574cfc /pkgs/desktops/gnome/core | |
| parent | 23ba741aecb970a451e1be24b59ddc6daba32edc (diff) | |
| parent | eceb2ec6a49f23113de8a86e783db7c669ff236f (diff) | |
| download | nixpkgs-f7aa55946bc2d3a61c819086099d658dcc1b2c1e.tar nixpkgs-f7aa55946bc2d3a61c819086099d658dcc1b2c1e.tar.gz nixpkgs-f7aa55946bc2d3a61c819086099d658dcc1b2c1e.tar.bz2 nixpkgs-f7aa55946bc2d3a61c819086099d658dcc1b2c1e.tar.lz nixpkgs-f7aa55946bc2d3a61c819086099d658dcc1b2c1e.tar.xz nixpkgs-f7aa55946bc2d3a61c819086099d658dcc1b2c1e.tar.zst nixpkgs-f7aa55946bc2d3a61c819086099d658dcc1b2c1e.zip | |
Merge branch 'staging-next' into staging
; Conflicts: ; nixos/doc/manual/from_md/release-notes/rl-2205.section.xml ; nixos/doc/manual/release-notes/rl-2205.section.md ; pkgs/build-support/libredirect/default.nix
Diffstat (limited to 'pkgs/desktops/gnome/core')
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-shell/default.nix | 7 |
1 files 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 5e03551dcec..5de52723d00 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" ''; |