From ae160b582cefbf20a2c4d2443624198f31194d3a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 10 Feb 2017 12:51:22 -0600
Subject: [PATCH] melpa-packages: init w3m at 20170203.647

---
 .../editors/emacs-modes/melpa-generated.nix   | 19 +++++++++++++++++++
 .../editors/emacs-modes/melpa-packages.nix    | 13 ++++++++++++-
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/emacs-packages.nix             |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 8dfad041b9f6..a47b5d69760d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -69224,6 +69224,25 @@
           license = lib.licenses.free;
         };
       }) {};
+    w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "w3m";
+        version = "20170203.647";
+        src = fetchcvs {
+          cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
+          module = "emacs-w3m";
+          sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m";
+          sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc";
+          name = "w3m";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/w3m";
+          license = lib.licenses.free;
+        };
+      }) {};
     wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wacspace";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 6081c96006ad..60cbf486777b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -13,7 +13,7 @@ To update the list of packages from MELPA,
 
 */
 
-{ lib }:
+{ lib, external }:
 
 self:
 
@@ -174,6 +174,17 @@ self:
 
       # upstream issue: missing file header
       zeitgeist = markBroken super.zeitgeist;
+
+      w3m = super.w3m.override (args: {
+        melpaBuild = drv: args.melpaBuild (drv // {
+          prePatch =
+            let w3m = "${lib.getBin external.w3m}/bin/w3m"; in ''
+              substituteInPlace w3m.el \
+                --replace 'defcustom w3m-command nil' \
+                          'defcustom w3m-command "${w3m}"'
+            '';
+        });
+      });
     };
 
     melpaPackages = super // overrides;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66c20853019b..42d7c142cf7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13121,7 +13121,7 @@ with pkgs;
     external = {
       inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent;
       inherit (pythonPackages) elpy;
-      inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig;
+      inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m;
     };
   };
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 092f352ec5b9..5c50fe383bb9 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -56,7 +56,7 @@ let
   };
 
   melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
-    inherit lib;
+    inherit external lib;
   };
 
   orgPackages = import ../applications/editors/emacs-modes/org-packages.nix {