diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-08-25 21:54:45 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-08-25 21:54:45 -0400 |
| commit | b2fd2b739e59686ee0636ed921cc90eb38a1a266 (patch) | |
| tree | 4dc833f85f263a959c64efa00d0d1e8e786ec347 /pkgs/applications | |
| parent | 741163efdb1772ed9018231cdf3b12cc5da63112 (diff) | |
| download | nixlib-b2fd2b739e59686ee0636ed921cc90eb38a1a266.tar nixlib-b2fd2b739e59686ee0636ed921cc90eb38a1a266.tar.gz nixlib-b2fd2b739e59686ee0636ed921cc90eb38a1a266.tar.bz2 nixlib-b2fd2b739e59686ee0636ed921cc90eb38a1a266.tar.lz nixlib-b2fd2b739e59686ee0636ed921cc90eb38a1a266.tar.xz nixlib-b2fd2b739e59686ee0636ed921cc90eb38a1a266.tar.zst nixlib-b2fd2b739e59686ee0636ed921cc90eb38a1a266.zip | |
emacs-irony: fix build
Fixes #66556
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f57c1b71b13d..d80d680aaa1f 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -131,20 +131,20 @@ 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: { + irony = super.irony.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; preConfigure = '' cd server ''; preBuild = '' make + install -D bin/irony-server $out/bin/irony-server + cd .. ''; - postInstall = '' - mkdir -p $out - mv $out/share/emacs/site-lisp/elpa/*/server/bin $out - rm -rf $out/share/emacs/site-lisp/elpa/*/server - ''; - preCheck = '' + checkPhase = '' cd source/server + make check + cd ../.. ''; dontUseCmakeBuildDir = true; doCheck = true; @@ -396,13 +396,6 @@ 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; - }; - }); - orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time |