parent
741163efdb
commit
b2fd2b739e
@ -131,20 +131,20 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
|
|||||||
# upstream issue: missing file header
|
# upstream issue: missing file header
|
||||||
initsplit = markBroken super.initsplit;
|
initsplit = markBroken super.initsplit;
|
||||||
|
|
||||||
irony = super.irony.overrideAttrs(old: {
|
irony = super.irony.overrideAttrs (old: {
|
||||||
|
cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
cd server
|
cd server
|
||||||
'';
|
'';
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
make
|
make
|
||||||
|
install -D bin/irony-server $out/bin/irony-server
|
||||||
|
cd ..
|
||||||
'';
|
'';
|
||||||
postInstall = ''
|
checkPhase = ''
|
||||||
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
|
cd source/server
|
||||||
|
make check
|
||||||
|
cd ../..
|
||||||
'';
|
'';
|
||||||
dontUseCmakeBuildDir = true;
|
dontUseCmakeBuildDir = true;
|
||||||
doCheck = 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
|
# Expects bash to be at /bin/bash
|
||||||
helm-rtags = markBroken super.helm-rtags;
|
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 =
|
orgit =
|
||||||
(super.orgit.overrideAttrs (attrs: {
|
(super.orgit.overrideAttrs (attrs: {
|
||||||
# searches for Git at build time
|
# searches for Git at build time
|
||||||
|
Loading…
x
Reference in New Issue
Block a user