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

emacs-cmake-mode: do not run configure

Browse Source 
Before this patch, the stable version did not run configure, and the
unstable version added `openssl` and `pkgconfig` to
dependencies.

Also, `dontConfigure = true` seems more readable than `configureScript
= "true"`.
This commit is contained in:
Yury G. Kudryashov 2019-10-28 20:27:27 -04:00
parent 064ccfd19b
commit 0681bce6e8
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;
@ -52,14 +52,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
];
});
# Expects bash to be at /bin/bash # Expects bash to be at /bin/bash
company-rtags = markBroken super.company-rtags; company-rtags = markBroken super.company-rtags;
@ -286,10 +281,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;