diff options
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/snippets/nix-mode/shell-nix | 7 | ||||
| -rw-r--r-- | emacs/.emacs.d/wpc/wpc-nix.el | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/emacs/.emacs.d/snippets/nix-mode/shell-nix b/emacs/.emacs.d/snippets/nix-mode/shell-nix index 4c308bb51b3a..45cb24e2b9e3 100644 --- a/emacs/.emacs.d/snippets/nix-mode/shell-nix +++ b/emacs/.emacs.d/snippets/nix-mode/shell-nix @@ -2,9 +2,10 @@ # name: shell.nix boilerplate # key: import # -- -with import <nixpkgs> {}; - -stdenv.mkDerivation { +let + briefcase = with import <briefcase> {}; + pkgs = briefcase.third_party.pkgs; +in stdenv.mkDerivation { name = "$1"; buildInputs = [ $2 diff --git a/emacs/.emacs.d/wpc/wpc-nix.el b/emacs/.emacs.d/wpc/wpc-nix.el index b67a0f80f95d..501531f23789 100644 --- a/emacs/.emacs.d/wpc/wpc-nix.el +++ b/emacs/.emacs.d/wpc/wpc-nix.el @@ -59,7 +59,7 @@ This function was taken from @tazjin's depot and adapted for my monorepo. (interactive "sAttribute: ") (lexical-let* ((outbuf (get-buffer-create (format "*briefcase-out/%s*" attribute))) (errbuf (get-buffer-create (format "*briefcase-errors/%s*" attribute))) - (expression (format "let depot = import <depot> {}; briefcase = import <briefcase> {}; in depot.nix.buildLisp.sbclWith [ briefcase.%s ]" attribute)) + (expression (format "let briefcase = import <briefcase> {}; in briefcase.third_party.depot.nix.buildLisp.sbclWith [ briefcase.%s ]" attribute)) (command (list "nix-build" "-E" expression))) (message "Acquiring Lisp for <briefcase>.%s" attribute) (make-process :name (format "nix-build/%s" attribute) |