diff options
author | adisbladis <adisbladis@gmail.com> | 2019-11-01 16:37:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-01 16:37:03 +0000 |
commit | 8930e0c21d5a9ae277858feee68ddc10af0a4ff0 (patch) | |
tree | 0ab4e3f000b8a7254a435f970fd0890c96f838d5 | |
parent | 0f76051d670609c9be34f47fa08f161389a060b6 (diff) | |
parent | 0681bce6e839ed4faa74fe44ca7a32789680216d (diff) | |
download | nixpkgs-8930e0c21d5a9ae277858feee68ddc10af0a4ff0.tar nixpkgs-8930e0c21d5a9ae277858feee68ddc10af0a4ff0.tar.gz nixpkgs-8930e0c21d5a9ae277858feee68ddc10af0a4ff0.tar.bz2 nixpkgs-8930e0c21d5a9ae277858feee68ddc10af0a4ff0.tar.lz nixpkgs-8930e0c21d5a9ae277858feee68ddc10af0a4ff0.tar.xz nixpkgs-8930e0c21d5a9ae277858feee68ddc10af0a4ff0.tar.zst nixpkgs-8930e0c21d5a9ae277858feee68ddc10af0a4ff0.zip |
Merge pull request #72210 from urkud/emacs-cmake-mode-dontConfigure
emacs-cmake-mode: do not run `configure`
-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 f5291955a12..e15da80b3b1 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; @@ -63,14 +63,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; 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 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; |