1 files changed, 58 insertions, 20 deletions

diff --git a/nixpkgs/pkgs/applications/editors/edbrowse/default.nix b/nixpkgs/pkgs/applications/editors/edbrowse/default.nix
index 86cc81a58c26..5b37b86556b7 100644
--- a/nixpkgs/pkgs/applications/editors/edbrowse/default.nix
+++ b/nixpkgs/pkgs/applications/editors/edbrowse/default.nix
@@ -1,41 +1,79 @@
-{ lib, stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, curl
+, duktape
+, html-tidy
+, openssl
+, pcre
+, perl
+, pkg-config
+, quickjs
+, readline
+, which
+}:
 
 stdenv.mkDerivation rec {
   pname = "edbrowse";
-  version = "3.7.7";
+  version = "3.8.0";
 
-  buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
+  src = fetchFromGitHub {
+    owner = "CMB";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    which
+  ];
+  buildInputs = [
+    curl
+    duktape
+    html-tidy
+    openssl
+    pcre
+    perl
+    quickjs
+    readline
+  ];
+
+  patches = [
+    # Fixes some small annoyances on src/makefile
+    ./0001-small-fixes.patch
+  ];
 
   postPatch = ''
-    for i in ./tools/*.pl
-    do
-      substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl"
+    substituteInPlace src/makefile --replace\
+      '-L/usr/local/lib/quickjs' '-L${quickjs}/lib/quickjs'
+    for i in $(find ./tools/ -type f ! -name '*.c'); do
+      patchShebangs $i
     done
   '';
 
   makeFlags = [
     "-C" "src"
-    "prefix=${placeholder "out"}"
+    "PREFIX=${placeholder "out"}"
   ];
 
-  src = fetchFromGitHub {
-    owner = "CMB";
-    repo = "edbrowse";
-    rev = "v${version}";
-    sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf";
-  };
   meta = with lib; {
+    homepage = "https://edbrowse.org/";
     description = "Command Line Editor Browser";
     longDescription = ''
-      Edbrowse is a combination editor, browser, and mail client that is 100% text based.
-      The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html.
-      This program was originally written for blind users, but many sighted users have taken advantage of the unique scripting capabilities of this program, which can be found nowhere else.
-      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.
-      '';
+      Edbrowse is a combination editor, browser, and mail client that is 100%
+      text based. The interface is similar to /bin/ed, though there are many
+      more features, such as editing multiple files simultaneously, and
+      rendering html. This program was originally written for blind users, but
+      many sighted users have taken advantage of the unique scripting
+      capabilities of this program, which can be found nowhere else. 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 = licenses.gpl1Plus;
-    homepage = "https://edbrowse.org/";
     maintainers = with maintainers; [ schmitthenner vrthra equirosa ];
     platforms = platforms.linux;
   };
 }
+# TODO: send the patch to upstream developers