diff options
| author | adisbladis <adisbladis@gmail.com> | 2021-08-06 16:26:09 -0500 |
|---|---|---|
| committer | Rasmus Précenth <rasmus@precenth.eu> | 2021-08-24 14:26:57 +0200 |
| commit | 6a5fc6becadc086f548582e513edd7b7c07dcda6 (patch) | |
| tree | d4172ac7357c360e5ae930d0bb9a5b6d9410658c | |
| parent | emacs: Add custom elpa fetcher (diff) | |
| download | nixpkgs-6a5fc6becadc086f548582e513edd7b7c07dcda6.tar.gz | |
emacs.pkgs.elpaPackages: Use custom elpa fetcher
| -rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 02a9a6e65622..0b8929d51274 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -21,7 +21,7 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText }: +{ lib, stdenv, buildPackages, texinfo, writeText }: self: let @@ -41,7 +41,10 @@ self: let }: let imported = import generated { - inherit (self) callPackage; + callPackage = pkgs: args: self.callPackage pkgs (args // { + # Use custom elpa url fetcher with fallback/uncompress + fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + }); }; super = removeAttrs imported [ "dash" ]; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d168d34e3738..c682a9da0141 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -26,7 +26,7 @@ let mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix { - inherit (pkgs) stdenv texinfo writeText; + inherit (pkgs) stdenv texinfo writeText buildPackages; inherit lib; }; |