@@ -4398,9 +4398,10 @@ we have some options that can be provided...
4398
4398
, config ? {}
4399
4399
, overlays ? []
4400
4400
, pkgs ? import <nixpkgs> { inherit crossSystem system config overlays; }
4401
+ , evalPkgs ? pkgs
4401
4402
, ensure ? f: n: f
4402
4403
, small ? pkgs.config.bauer.small or true
4403
- , emacs-overlay ? { overlay = import (pkgs .fetchFromGitHub {
4404
+ , emacs-overlay ? { overlay = import (evalPkgs .fetchFromGitHub {
4404
4405
owner = "nix-community";
4405
4406
repo = "emacs-overlay";
4406
4407
rev = "28c31e0ae90b6fcf51f2d02c5d43fe1715dc6393";
@@ -4506,18 +4507,18 @@ Emacs configuration. use-package-list generates this list automatically.
4506
4507
4507
4508
#+BEGIN_SRC nix
4508
4509
package-list =
4509
- runCommand "package-list" {
4510
- buildInputs = [ customEmacsPackages .emacs ];
4510
+ evalPkgs. runCommand "package-list" {
4511
+ buildInputs = [ evalPkgs .emacs ];
4511
4512
} ''
4512
4513
#+END_SRC
4513
4514
4514
4515
#+BEGIN_SRC nix
4515
4516
emacs --batch --quick \
4516
- -L ${customEmacsPackages .use-package
4517
+ -L ${evalPkgs.emacsPackages .use-package
4517
4518
}/share/emacs/site-lisp/elpa/use-package-* \
4518
- -L ${customEmacsPackages .delight
4519
+ -L ${evalPkgs.emacsPackages .delight
4519
4520
}/share/emacs/site-lisp/elpa/delight-* \
4520
- -L ${customEmacsPackages .bind-key
4521
+ -L ${evalPkgs.emacsPackages .bind-key
4521
4522
}/share/emacs/site-lisp/elpa/bind-key-* \
4522
4523
-l ${ensure ./site-lisp/set-defaults.el
4523
4524
"site-lisp/set-defaults.el"} \
@@ -5327,8 +5328,9 @@ in {
5327
5328
packages = forAllSystems (system: {
5328
5329
bauer = let
5329
5330
pkgs = nixpkgsFor.${system};
5330
- in import (pkgs.runCommand "README" {
5331
- buildInputs = with pkgs; [ emacs git ];
5331
+ evalPkgs = nixpkgsFor.x86_64-linux;
5332
+ in import (evalPkgs.runCommand "README" {
5333
+ buildInputs = with evalPkgs; [ emacs git ];
5332
5334
} (''
5333
5335
install -D ${./README.org} $out/README.org
5334
5336
cd $out
@@ -5337,7 +5339,7 @@ in {
5337
5339
-l ob-tangle \
5338
5340
--eval "(org-babel-tangle-file \"README.org\")" > /dev/null
5339
5341
cp bauer.nix default.nix
5340
- '')) { inherit pkgs emacs-overlay; };
5342
+ '')) { inherit pkgs emacs-overlay evalPkgs ; };
5341
5343
});
5342
5344
5343
5345
defaultPackage = forAllSystems (system: self.packages.${system}.bauer);
0 commit comments