public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'patch-9' of git://github.com/matthewbauer/nixpkgs

Browse Source
This commit is contained in:
Shea Levy 2018-02-12 09:33:25 -05:00
commit 038b893338
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/emacs/buffer.nix
View File

@ -4,7 +4,8 @@
{ lib, writeText, inherit-local }: { lib, writeText, inherit-local }:
rec { rec {
withPackages = pkgs: let withPackages = pkgs': let
pkgs = builtins.filter (x: x != null) pkgs';
extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs); extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs);
in writeText "dir-locals.el" '' in writeText "dir-locals.el" ''
(require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc") (require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc")