about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-12-09T03·00+0000
committerVincent Ambo <tazjin@google.com>2019-12-09T03·00+0000
commit7044424f52be19f79eb7eacbefa06b869a0dd9c3 (patch)
treece31e7132558ca4e09bfa0ff7a0ce40b0a93f98a
parent46e5a23937c68d89d1d080ad6feef7587bcdbdc8 (diff)
fix(writeElispBin): Add required nixpkgs attributes for elisp r/104
-rw-r--r--overrides/writeElispBin.nix4
-rw-r--r--third_party/default.nix5
2 files changed, 6 insertions, 3 deletions
diff --git a/overrides/writeElispBin.nix b/overrides/writeElispBin.nix
index 72871b9f0b43..abd39343dd91 100644
--- a/overrides/writeElispBin.nix
+++ b/overrides/writeElispBin.nix
@@ -1,9 +1,9 @@
 { pkgs, ... }:
 
-{ name, src, deps ? (_: []), emacs ? pkgs.emacs26-nox }:
+{ name, src, deps ? (_: []), emacs ? pkgs.third_party.emacs26-nox }:
 
 let
-  inherit (pkgs) emacsPackagesFor writeTextFile;
+  inherit (pkgs.third_party) emacsPackagesFor writeTextFile;
   inherit (builtins) isString toFile;
 
   finalEmacs = (emacsPackagesFor emacs).emacsWithPackages deps;
diff --git a/third_party/default.nix b/third_party/default.nix
index 075a4314ef23..2ba106795846 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -24,6 +24,8 @@ let
       buildGoPackage
       cargo
       darwin
+      emacs26-nox
+      emacsPackagesFor
       fetchFromGitHub
       google-cloud-sdk
       haskell
@@ -38,7 +40,8 @@ let
       symlinkJoin
       tree
       writeShellScriptBin
-      writeText;
+      writeText
+      writeTextFile;
   };
 
 in exposed // {