diff options
author | adisbladis <adisbladis@gmail.com> | 2021-02-24 15:01:08 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2021-02-24 15:40:58 +0100 |
commit | c68c81fb0150b251b2e72d9cdd5d735403c3df50 (patch) | |
tree | 7673ea0cabba1c1282281250d15c4e52c66a3a4e /pkgs/top-level/emacs-packages.nix | |
parent | b673be833616a92677fb3fdffa8e1a85c74af1d0 (diff) |
emacsPackagesFor: Remove all pkgs inherits from call site
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 076e67a1e7407..d3c62b3ff7796 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -32,12 +32,7 @@ # `meta` with `platforms` and `homepage` set to something you are # unlikely to want to override for most packages -{ lib, newScope, stdenv, fetchurl, fetchFromGitHub, runCommand, writeText - -, emacs, texinfo, lndir, makeWrapper - -, pkgs -}: +{ pkgs, lib ? pkgs.lib, emacs }: let @@ -50,7 +45,8 @@ let }; mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix { - inherit lib stdenv texinfo writeText; + inherit (pkgs) stdenv texinfo writeText; + inherit lib; }; # Contains both melpa stable & unstable @@ -65,14 +61,15 @@ let }; emacsWithPackages = import ../build-support/emacs/wrapper.nix { - inherit lib lndir makeWrapper runCommand; + inherit (pkgs) lndir makeWrapper runCommand; + inherit lib; }; mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix { inherit lib pkgs; }; -in lib.makeScope newScope (self: lib.makeOverridable ({ +in lib.makeScope pkgs.newScope (self: lib.makeOverridable ({ elpaPackages ? mkElpaPackages self , melpaStablePackages ? mkMelpaStablePackages self , melpaPackages ? mkMelpaPackages self |