diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
| commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
| tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/tools/misc/remind | |
| parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
| parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
| download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip | |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/remind')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/remind/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/tools/misc/remind/default.nix b/nixpkgs/pkgs/tools/misc/remind/default.nix index 293cc136c8c8..d10811ffa049 100644 --- a/nixpkgs/pkgs/tools/misc/remind/default.nix +++ b/nixpkgs/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"; |