diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-08-26 10:47:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-26 10:47:35 +0200 |
| commit | d42ae527190d087b157fb00791896a9a59a36537 (patch) | |
| tree | e85bbdb6d280b587e9658cf3a4ff9abbc8ba01a3 /pkgs/applications | |
| parent | d5a5718f2a1be8d45da2636da544f1afc9a073e3 (diff) | |
| parent | b993fb03aca3967c6efc7f40971ec900d161dee5 (diff) | |
| download | nixlib-d42ae527190d087b157fb00791896a9a59a36537.tar nixlib-d42ae527190d087b157fb00791896a9a59a36537.tar.gz nixlib-d42ae527190d087b157fb00791896a9a59a36537.tar.bz2 nixlib-d42ae527190d087b157fb00791896a9a59a36537.tar.lz nixlib-d42ae527190d087b157fb00791896a9a59a36537.tar.xz nixlib-d42ae527190d087b157fb00791896a9a59a36537.tar.zst nixlib-d42ae527190d087b157fb00791896a9a59a36537.zip | |
Merge pull request #67471 from matthewbauer/fix-66556
emacs-irony: fix build
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f57c1b71b13d..9574ec43a612 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -33,8 +33,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (import ./libgenerated.nix lib self) melpaDerivation; super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson)); - generic = import ./melpa-generic.nix; - overrides = rec { shared = { # Expects bash to be at /bin/bash @@ -131,20 +129,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 +394,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 |