diff options
| author | John Chadwick <john@jchw.io> | 2023-05-15 23:06:07 -0400 |
|---|---|---|
| committer | John Chadwick <john@jchw.io> | 2023-05-15 23:06:07 -0400 |
| commit | 64e996fd1b1399778bfe11930230845d3008204e (patch) | |
| tree | 0fe20b6a298f05e9c21f4edf6aff19f76fcd9b68 /pkgs/desktops/cdesktopenv | |
| parent | cc7ec74b8812a446dd3ad9ceca22165fd942bb53 (diff) | |
| download | nixpkgs-64e996fd1b1399778bfe11930230845d3008204e.tar nixpkgs-64e996fd1b1399778bfe11930230845d3008204e.tar.gz nixpkgs-64e996fd1b1399778bfe11930230845d3008204e.tar.bz2 nixpkgs-64e996fd1b1399778bfe11930230845d3008204e.tar.lz nixpkgs-64e996fd1b1399778bfe11930230845d3008204e.tar.xz nixpkgs-64e996fd1b1399778bfe11930230845d3008204e.tar.zst nixpkgs-64e996fd1b1399778bfe11930230845d3008204e.zip | |
cdesktopenv: work around tcl8.6.13 error
Diffstat (limited to 'pkgs/desktops/cdesktopenv')
| -rw-r--r-- | pkgs/desktops/cdesktopenv/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index e461ac9ea07..0124220346a 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -3,7 +3,7 @@ , xorgproto, libX11, bison, ksh, perl, gnum4 , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps , libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf -, ncompress, mkfontdir, tcl, libXaw, libxcrypt, gcc, glibcLocales +, ncompress, mkfontdir, tcl-8_5, libXaw, libxcrypt, gcc, glibcLocales , autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot , rpcsvc-proto }: @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libX11 libXinerama libXt libXext libtirpc motif libXft xbitmaps - libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh libxcrypt + libjpeg libXmu libXdmcp libXScrnSaver tcl-8_5 libXaw ksh libxcrypt ]; nativeBuildInputs = [ bison ncompress autoPatchelfHook makeWrapper fakeroot @@ -59,6 +59,9 @@ in stdenv.mkDerivation rec { "BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11" "IMAKECPP=cpp" "LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive" + # Workaround for dtdocbook issue with tcl 8.6.13. + # TODO: this might be possible to remove when updating CDE + "TCLLIB=-ltcl8.5" ]; preConfigure = '' |