Merge pull request #328070 from linj-fork/pr/improve-notdeft-compile

emacsPackages.notdeft: improve build process of notdeft-xapian

pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix

@@ -30,14 +30,23 @@ let
     pname = "notdeft-xapian";
     inherit version src;
 
-    sourceRoot = "${src.name}/xapian";
+    strictDeps = true;
 
-    nativeBuildInputs = [
-      pkg-config
+    nativeBuildInputs = [ pkg-config ];
+
+    buildInputs = [
       tclap
       xapian
     ];
 
+    buildPhase = ''
+      runHook preBuild
+
+      $CXX -std=c++11 -o notdeft-xapian xapian/notdeft-xapian.cc -lxapian
+
+      runHook postBuild
+    '';
+
     installPhase = ''
       runHook preInstall
 
@@ -66,6 +75,10 @@ melpaBuild {
      ${lib.optionalString withIvy ''"extras/notdeft-ivy.el"''})
   '';
 
+  passthru = {
+    inherit notdeft-xapian;
+  };
+
   meta = {
     homepage = "https://tero.hasu.is/notdeft/";
     description = "Fork of Deft that uses Xapian as a search engine";