diff options
author | Yury G. Kudryashov <urkud@urkud.name> | 2019-10-28 20:27:27 -0400 |
---|---|---|
committer | Yury G. Kudryashov <urkud@urkud.name> | 2019-10-28 20:27:27 -0400 |
commit | 0681bce6e839ed4faa74fe44ca7a32789680216d (patch) | |
tree | 6adc978944463492043d26063d5e8e4ff7eacbad /pkgs/applications | |
parent | 064ccfd19b68e17f8d04498d4bce6959b9554660 (diff) | |
download | nixlib-0681bce6e839ed4faa74fe44ca7a32789680216d.tar nixlib-0681bce6e839ed4faa74fe44ca7a32789680216d.tar.gz nixlib-0681bce6e839ed4faa74fe44ca7a32789680216d.tar.bz2 nixlib-0681bce6e839ed4faa74fe44ca7a32789680216d.tar.lz nixlib-0681bce6e839ed4faa74fe44ca7a32789680216d.tar.xz nixlib-0681bce6e839ed4faa74fe44ca7a32789680216d.tar.zst nixlib-0681bce6e839ed4faa74fe44ca7a32789680216d.zip |
emacs-cmake-mode: do not run `configure`
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"`.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 0ad7b02befad..5ad9028a1b5f 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -16,7 +16,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac dontConfigure = pkg: if pkg != null then pkg.override (args: { melpaBuild = drv: args.melpaBuild (drv // { - configureScript = "true"; + dontConfigure = true; }); }) else null; @@ -52,14 +52,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # part of a larger package caml = dontConfigure super.caml; - cmake-mode = super.cmake-mode.overrideAttrs (attrs: { - buildInputs = (attrs.buildInputs or []) ++ [ - external.openssl - ]; - nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ - external.pkgconfig - ]; - }); + # part of a larger package + # upstream issue: missing package version + cmake-mode = dontConfigure super.cmake-mode; # Expects bash to be at /bin/bash 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 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 connection = markBroken super.connection; |