Skip to content

Commit

Permalink
emacsPackages.melpaPackages: fix cmake-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
bendlas committed Aug 12, 2019
1 parent ff79e9d commit ac2eb31
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
};

Expand Down

0 comments on commit ac2eb31

Please sign in to comment.