From 3f783e7fd11ff9069a682dbf108fb0c307cf1973 Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 19 Aug 2016 18:11:06 +0100 Subject: nano: 2.6.2 -> 2.6.3 Add patch to make Darwin happy & fix #17835 --- pkgs/applications/editors/nano/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index dee2d6f0dff..f99e5d76a47 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -26,6 +26,15 @@ stdenv.mkDerivation rec { ${optionalString enableTiny "--enable-tiny"} ''; + patchFlags = [ "-p0" ]; + + patches = optional stdenv.isDarwin + (fetchurl { + name = "darwin.patch"; + url = "https://trac.macports.org/browser/trunk/dports/editors/nano/files/patch-src-winio.c.diff?rev=151356&format=txt"; + sha256 = "184q33irz9px2svwr2qx70zvfby5zlwlhv4k607yzsy90fq2jpdd"; + }); + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/text.c --replace "__time_t" "time_t" ''; -- cgit 1.4.1