emacsPackagesFor: Remove all pkgs inherits from call site
This commit is contained in:
parent
b673be8336
commit
c68c81fb01
|
@ -21947,12 +21947,7 @@ in
|
|||
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
||||
};
|
||||
|
||||
emacsPackagesFor = emacs: import ./emacs-packages.nix {
|
||||
inherit lib newScope stdenv pkgs;
|
||||
inherit fetchFromGitHub fetchurl;
|
||||
inherit emacs texinfo makeWrapper runCommand writeText;
|
||||
inherit (xorg) lndir;
|
||||
};
|
||||
emacsPackagesFor = emacs: import ./emacs-packages.nix { inherit pkgs lib emacs; };
|
||||
|
||||
inherit (gnome3) empathy;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue