Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b27da0dde7e1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 49d7cc29419b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 9, 2019

  1. Patch remind source to work on macOS (#67870) 

    The default version of the source will show a banner on macOS and Windows which tells the user that the author would rather that they didn’t use remind on Apple or Microsoft products, and then sleep for 5 seconds.

There is no way for the user to remove this obstacle other than patch the source and recompile, which is also what other package managers do.

This commit also changes supported platform from linux to unix.
    @sorbits @matthewbauer
    sorbits authored and matthewbauer committed Sep 9, 2019
    Copy the full SHA
    49d7cc2 View commit details
Showing with 11 additions and 3 deletions.
  1. +11 −3 pkgs/tools/misc/remind/default.nix
14 changes: 11 additions & 3 deletions pkgs/tools/misc/remind/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,9 @@ let
tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ];
tclLibPaths = stdenv.lib.concatStringsSep " "
(map (p: "${p}/lib/${p.libPrefix}") tclLibraries);
tkremindPatch = optionalString tkremind ''
substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
'';
in stdenv.mkDerivation {
name = "remind-3.1.16";
src = fetchurl {
@@ -21,8 +24,13 @@ in stdenv.mkDerivation {
nativeBuildInputs = optional tkremind makeWrapper;
propagatedBuildInputs = tclLibraries;

postPatch = optionalString tkremind ''
substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
postPatch = ''
substituteInPlace ./configure \
--replace "sleep 1" "true"
substituteInPlace ./src/init.c \
--replace "rkrphgvba(0);" "" \
--replace "rkrphgvba(1);" ""
${tkremindPatch}
'';

postInstall = optionalString tkremind ''
@@ -34,6 +42,6 @@ in stdenv.mkDerivation {
description = "Sophisticated calendar and alarm program for the console";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [raskin kovirobi];
platforms = with stdenv.lib.platforms; linux;
platforms = with stdenv.lib.platforms; unix;
};
}