Commit 68576df9 authored by Francesco Gazzetta's avatar Francesco Gazzetta
Browse files

treewide: move tcl libraries under tclPackages

parent 30004591

pkgs/applications/misc/therion/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
, pkg-config

, perl

, tcl

, tcllib

, tclPackages

, tk

, expat

, bwidget

, python3

, texliveTeTeX

, survex
@@ -25,7 +24,6 @@ 
, sqlite

, libtiff

, curl

, tkimg

}:



stdenv.mkDerivation rec {
@@ -59,7 +57,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    expat

    tkimg

    tclPackages.tkimg

    proj

    wxGTK32

    vtk
@@ -74,8 +72,8 @@ stdenv.mkDerivation rec { 
    curl

    fmt

    tcl

    tcllib

    bwidget

    tclPackages.tcllib

    tclPackages.bwidget

  ];



  fixupPhase = ''

pkgs/applications/science/electronics/openroad/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
, readline

, spdlog

, tcl

, tcllib

, tclPackages

, xorg

, yosys

, zlib
@@ -72,7 +72,7 @@ mkDerivation rec { 
    readline

    spdlog

    tcl

    tcllib

    tclPackages.tcllib

    yosys

    xorg.libX11

    zlib

pkgs/applications/version-management/fossil/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
, sqlite

, ed

, which

, tcllib

, tclPackages

, withJson ? true

}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { 
  # required for build time tool `./tools/translate.c`

  depsBuildBuild = [ buildPackages.stdenv.cc ];



  nativeBuildInputs = [ installShellFiles tcl tcllib ];

  nativeBuildInputs = [ installShellFiles tcl tclPackages.tcllib ];



  buildInputs = [ zlib openssl readline which ed ]

    ++ lib.optional stdenv.hostPlatform.isDarwin libiconv

pkgs/by-name/em/emacspeak/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
, makeWrapper

, stdenv

, tcl

, tclx

, tclPackages

}:



stdenv.mkDerivation (finalAttrs: {
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    espeak-ng

    tcl

    tclx

    tclPackages.tclx

  ];



  strictDeps = true;
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { 
    find "$d" -type f -not -executable -execdir chmod 644 {} +

    makeWrapper ${lib.getExe emacs} $out/bin/emacspeak \

        --set DTK_PROGRAM "${placeholder "out"}/share/emacs/site-lisp/emacspeak/servers/espeak" \

        --set TCLLIBPATH "${tclx}/lib" \

        --set TCLLIBPATH "${tclPackages.tclx}/lib" \

        --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"'

  '';

pkgs/by-name/ke/keydb/package.nix

+9 −6
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  jemalloc,

  which,

  tcl,

  tcltls,

  tclPackages,

  ps,

  getconf,

  nixosTests,
@@ -60,11 +60,14 @@ stdenv.mkDerivation (finalAttrs: { 


  # darwin currently lacks a pure `pgrep` which is extensively used here

  doCheck = !stdenv.hostPlatform.isDarwin;

  nativeCheckInputs = [

  nativeCheckInputs =

    [

      which

      tcl

      ps

  ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ] ++ lib.optionals tlsSupport [ tcltls ];

    ]

    ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]

    ++ lib.optionals tlsSupport [ tclPackages.tcltls ];

  checkPhase = ''

    runHook preCheck