diff options
| author | Balletie <skip_meesie@hotmail.com> | 2017-09-01 15:57:05 +0200 |
|---|---|---|
| committer | Balletie <skip_meesie@hotmail.com> | 2017-09-01 16:41:49 +0200 |
| commit | 311a1ee33a74c69dbb0dd31e5117a273316caff9 (patch) | |
| tree | 4e98a2a217482f6479ee7959e73c5c2b1cabf4b7 /pkgs/top-level/emacs-packages.nix | |
| parent | b2e7e231ec3ec67545aa9ace003973543dedb801 (diff) | |
| download | nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.gz nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.bz2 nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.lz nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.xz nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.zst nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.zip | |
rtags: Fix configure phase errors
Add pkgconfig as buildinput, so that the install path is correctly set with cmake. PkgConfig is an optional dependency for rtags, but they say it's necessary if you want to replace the prefix with CMAKE_INSTALL_PREFIX. See: https://github.com/Andersbakken/rtags/blob/caad9ac494f09960bd60a00061279efacc8d1d26/cmake/BashCompletion.cmake#L13 Furthermore, I let the configurePhase of the rtags emacs package be a noop.
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5c50fe383bb..4734b51046f 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -269,8 +269,11 @@ let rtags = melpaBuild rec { pname = "rtags"; - version = "2.0"; # really, it's some arbitrary git hash + version = "2.12"; src = external.rtags.src; + + configurePhase = ":"; + propagatedUserEnvPkgs = [ external.rtags ]; fileSpecs = [ "src/*.el" ]; inherit (external.rtags) meta; |