about summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs-modes
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2019-08-04 20:53:10 +0100
committeradisbladis <adisbladis@gmail.com>2019-08-07 18:04:22 +0100
commit978b34622bccce24f179ffaf4475544dbe2e61dd (patch)
tree9321795fc3fe21f5162d1e45177e86930ee3c687 /pkgs/applications/editors/emacs-modes
parentaf70adbc892e0b1c548cffa4a05749085dce2cbf (diff)
emacs-packages: Drop irony package
Use auto-generated melpa package
Diffstat (limited to 'pkgs/applications/editors/emacs-modes')
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-packages.nix28
1 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 47cc7ce1c64f4..920572198d0fb 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -105,6 +105,27 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         initsplit = markBroken super.initsplit;
 
+        irony = super.irony.overrideAttrs(old: {
+          preConfigure = ''
+            cd server
+          '';
+          preBuild = ''
+            make
+          '';
+          postInstall = ''
+            mkdir -p $out
+            mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
+            rm -rf $out/share/emacs/site-lisp/elpa/*/server
+          '';
+          preCheck = ''
+            cd source/server
+          '';
+          dontUseCmakeBuildDir = true;
+          doCheck = true;
+          packageRequires = [ self.emacs ];
+          nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
+        });
+
         # tries to write a log file to $HOME
         insert-shebang = super.insert-shebang.overrideAttrs (attrs: {
           HOME = "/tmp";
@@ -356,6 +377,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # Expects bash to be at /bin/bash
         helm-rtags = markBroken super.helm-rtags;
 
+        # Fails with "package does not untar cleanly into ..."
+        irony = shared.irony.overrideAttrs(old: {
+          meta = old.meta // {
+            broken = true;
+          };
+        });
+
         magit-annex = super.magit-annex.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =