Merge pull request #16666 from vrthra/edbrowse

edbrowse: 3.5.4.1 -> 3.6.1

1 files changed, 11 insertions, 7 deletions

diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 712ede2e316f..1d91a1368763 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,13 +1,17 @@
-{ stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl }:
+{ stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl, perl, html-tidy }:
 stdenv.mkDerivation rec {
   name = "edbrowse-${version}";
-  version = "3.5.4.1";
+  version = "3.6.1";
 
   nativeBuildInputs = [ unzip ];
-  buildInputs = [ curl pcre readline openssl spidermonkey_24 ];
+  buildInputs = [ curl pcre readline openssl spidermonkey_24 perl html-tidy ];
 
   patchPhase = ''
     substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
+    for i in ./tools/*.pl
+    do
+      substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl"
+    done
   '';
 
   NIX_CFLAGS_COMPILE = "-I${spidermonkey_24.dev}/include/mozjs-24";
@@ -15,9 +19,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://edbrowse.org/${name}.zip";
-    sha256 = "0fpzaalwvgwbns7yxq4a4i6hpdljmcjfyvx19r1dlb3vdfw0vx5l";
+    sha256 = "1grkn09r31nmvcnm76jkd8aclmd9n5141mpqvb86wndp9pa7gz7q";
   };
-  meta = {
+  meta = with stdenv.lib; {
     description = "Command Line Editor Browser";
     longDescription = ''
       Edbrowse is a combination editor, browser, and mail client that is 100% text based.
@@ -26,8 +30,8 @@ stdenv.mkDerivation rec {
       A batch job, or cron job, can access web pages on the internet, submit forms, and send email, with no human intervention whatsoever.
       edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke.
       '';
-    license = stdenv.lib.licenses.gpl1Plus;
+    license = licenses.gpl1Plus;
     homepage = http://edbrowse.org/;
-    maintainers = [ stdenv.lib.maintainers.schmitthenner ];
+    maintainers = [ maintainers.schmitthenner maintainers.vrthra ];
   };
 }