diff options
author | Andrew Brooks <andrew.brooks@flightaware.com> | 2021-04-30 18:05:22 -0500 |
---|---|---|
committer | Andrew Brooks <andrew.brooks@flightaware.com> | 2021-05-21 15:18:09 -0500 |
commit | 499adf6b0c5cd0808ade19c739d9e2bed1d5b553 (patch) | |
tree | 977718328d6df377ef90a2e0d856e3113f3d3cd8 /pkgs/tools/misc/remind | |
parent | 87c5626e416261d45a96ec016978294d7b16ec7c (diff) |
remind: Simplify package with tcl.mkTclDerivation
Diffstat (limited to 'pkgs/tools/misc/remind')
-rw-r--r-- | pkgs/tools/misc/remind/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 293cc136c8c8d..d10811ffa0496 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -3,20 +3,18 @@ , fetchurl , tk , tcllib -, makeWrapper +, tcl , tkremind ? true }: let - inherit (lib) optional optionalString; - tclLibraries = lib.optionals tkremind [ tcllib tk ]; - tclLibPaths = lib.concatStringsSep " " - (map (p: "${p}/lib/${p.libPrefix}") tclLibraries); + inherit (lib) optional optionals optionalString; + tclLibraries = optionals tkremind [ tcllib tk ]; tkremindPatch = optionalString tkremind '' substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" ''; in -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "remind"; version = "03.03.06"; @@ -25,7 +23,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-lpoMAXDJxwODY0/aoo25GRBYWFhE4uf11pR5/ITZX1s="; }; - nativeBuildInputs = optional tkremind makeWrapper; propagatedBuildInputs = tclLibraries; postPatch = '' @@ -37,10 +34,6 @@ stdenv.mkDerivation rec { ${tkremindPatch} ''; - postInstall = optionalString tkremind '' - wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}" - ''; - meta = with lib; { homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; |