Compare commits

..

No commits in common. "d91b0b04abc70aeb8a99ba7ea00d773b598c246b" and "a0e88fb445b6e95c84d496a6481615f3a94a9d4e" have entirely different histories.

4 changed files with 4 additions and 9 deletions

View File

@ -17,13 +17,12 @@ pkgs.stdenv.mkDerivation rec {
xorg.libXdmcp xorg.libXdmcp
libpulseaudio libpulseaudio
dbus.dev dbus.dev
python3 ] ++ lib.optionals full [
] ++ lib.optionals (full && stdenv.isLinux) [
gnome.gdm.dev gnome.gdm.dev
glib glib
pcre2 pcre2
systemd.dev systemd.dev
] ++ lib.optionals (full && stdenv.isLinux) [
# To address pkg-config warnings for glib. # To address pkg-config warnings for glib.
util-linux util-linux
libselinux libselinux

View File

@ -13,7 +13,6 @@ pkgs.stdenv.mkDerivation rec {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
ncurses ncurses
libiconv
libev libev
# Termo demo-glib.c # Termo demo-glib.c

View File

@ -14,6 +14,7 @@ let
ncurses ncurses
inkscape inkscape
#(groff.override { enableGhostscript = true; }) #(groff.override { enableGhostscript = true; })
libreoffice
imagemagick imagemagick
openssl openssl
@ -21,9 +22,6 @@ let
nss.tools nss.tools
# pdfsig # pdfsig
(poppler.override { utils = true; }) (poppler.override { utils = true; })
] ++ lib.optionals stdenv.isLinux [
# Missing on macOS as of writing.
libreoffice
]; ];
src = if local then src = if local then

View File

@ -28,9 +28,8 @@ pkgs.stdenv.mkDerivation rec {
tcl tcl
perl perl
ruby ruby
python3
] ++ lib.optionals (full && !tinycc.meta.broken) [
tinycc tinycc
python3
] ++ lib.optionals (!full) [ ] ++ lib.optionals (!full) [
libedit libedit
]; ];