public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72210 from urkud/emacs-cmake-mode-dontConfigure

Browse Source 
emacs-cmake-mode: do not run `configure`
This commit is contained in:
adisbladis 2019-11-01 16:37:03 +00:00 committed by GitHub
commit 8930e0c21d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -16,7 +16,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
dontConfigure = pkg: if pkg != null then pkg.override (args: { dontConfigure = pkg: if pkg != null then pkg.override (args: {
melpaBuild = drv: args.melpaBuild (drv // { melpaBuild = drv: args.melpaBuild (drv // {
configureScript = "true"; dontConfigure = true;
}); });
}) else null; }) else null;
@ -63,14 +63,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# part of a larger package # part of a larger package
caml = dontConfigure super.caml; caml = dontConfigure super.caml;
cmake-mode = super.cmake-mode.overrideAttrs (attrs: { # part of a larger package
buildInputs = (attrs.buildInputs or []) ++ [ # upstream issue: missing package version
external.openssl cmake-mode = dontConfigure super.cmake-mode;
];
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [
external.pkgconfig
];
});
company-rtags = fix-rtags super.company-rtags; company-rtags = fix-rtags super.company-rtags;
@ -293,10 +288,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# upstream issue: missing file header # upstream issue: missing file header
bufshow = markBroken super.bufshow; bufshow = markBroken super.bufshow;
# part of a larger package
# upstream issue: missing package version
cmake-mode = dontConfigure super.cmake-mode;
# upstream issue: missing file header # upstream issue: missing file header
connection = markBroken super.connection; connection = markBroken super.connection;