From ac2eb3151df879602c58280d09e9c205fcff8534 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 12 Aug 2019 02:26:34 +0200 Subject: [PATCH] emacsPackages.melpaPackages: fix cmake-mode --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 24e541f2695233..e642895c07906a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -50,6 +50,15 @@ 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 + ]; + }); + # Expects bash to be at /bin/bash company-rtags = markBroken super.company-rtags; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44c0e02ebbc5ac..871fe950cf192f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17961,7 +17961,7 @@ in inherit autoconf automake editorconfig-core-c git libffi libpng pkgconfig poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages - libtool zeromq; + libtool zeromq openssl; }; };