From 313a01876a559d2c6099a794b76c57084d5d1593 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Fri, 21 Sep 2018 15:52:37 +0800 Subject: [PATCH 1/2] Patch DVTM to use self-pipe, making it work on more platforms --- pkgs/tools/misc/dvtm/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index f25d134ca7902..91605a3c55020 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -9,6 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g"; }; + patches = [ + # https://github.com/martanne/dvtm/pull/69 + # Use self-pipe instead of signal blocking fixes issues on darwin. + (fetchurl { + url = "https://github.com/martanne/dvtm/commit/1f1ed664d64603f3f1ce1388571227dc723901b2.patch"; + sha256 = "1cby8x3ckvhzqa8yxlfrwzgm8wk7yz84kr9psdjr7xwpnca1cqrd"; + }) + ]; + + CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + postPatch = stdenv.lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h ''; @@ -28,7 +39,6 @@ stdenv.mkDerivation rec { description = "Dynamic virtual terminal manager"; homepage = http://www.brain-dump.org/projects/dvtm; license = licenses.mit; - platforms = platforms.linux; maintainers = [ maintainers.vrthra ]; }; } From 32b467bf6a5456c3f5251b60a305b7a1ad209693 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Sat, 22 Sep 2018 06:21:18 +0800 Subject: [PATCH 2/2] dvtm: refactor Add platforms list. --- pkgs/tools/misc/dvtm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 91605a3c55020..58c602113ddb7 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { homepage = http://www.brain-dump.org/projects/dvtm; license = licenses.mit; maintainers = [ maintainers.vrthra ]; + platforms = platforms.unix; }; }