diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-03 02:50:21 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-03 02:50:21 +0200 |
commit | 10c8e6d0c590d6c83aa2efee7f701983440cca78 (patch) | |
tree | b79325512b90438381604e1487ce0c1b63771f2f /pkgs/build-support/emacs | |
parent | 2fb4606f38deefa76da5d853645739f2faa315de (diff) | |
parent | c70c9649eaca0409b7104a02193cd81ee8e5103a (diff) | |
download | nixlib-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar nixlib-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.gz nixlib-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.bz2 nixlib-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.lz nixlib-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.xz nixlib-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.zst nixlib-10c8e6d0c590d6c83aa2efee7f701983440cca78.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/build-support/emacs')
-rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 27633c912b23..4e780b104b08 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -40,7 +40,7 @@ packagesFun: # packages explicitly requested by the user let explicitRequires = - if builtins.isFunction packagesFun + if lib.isFunction packagesFun then packagesFun self else packagesFun; in |