summary refs log tree commit diff stats
path: root/nix/.config/nixpkgs
diff options
context:
space:
mode:
authorAlan Pearce2017-07-05 19:09:06 +0200
committerAlan Pearce2017-07-05 19:09:06 +0200
commit60a00fda542594d6743df058923501f071bb2836 (patch)
treeb0bc899819d26af554dbc22fb01a5eafdc5fe605 /nix/.config/nixpkgs
parent93f2165cb0a1ecaff5ca40784d5c88d18a3657b4 (diff)
parent2e755628ac5c22bf5ce799a41c7bc5f9acbd0e44 (diff)
downloadnixfiles-60a00fda542594d6743df058923501f071bb2836.tar.lz
nixfiles-60a00fda542594d6743df058923501f071bb2836.tar.zst
nixfiles-60a00fda542594d6743df058923501f071bb2836.zip
Merge branch 'master' of ssh://alanpearce.eu/dotfiles
Diffstat (limited to 'nix/.config/nixpkgs')
-rw-r--r--nix/.config/nixpkgs/config.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nix/.config/nixpkgs/config.nix b/nix/.config/nixpkgs/config.nix
index 3b506937..dc4e40a2 100644
--- a/nix/.config/nixpkgs/config.nix
+++ b/nix/.config/nixpkgs/config.nix
@@ -2,7 +2,10 @@
   packageOverrides = super: let
     self = super.pkgs;
   in with self; rec {
-    myEmacs = super.callPackage ./emacs.nix {};
+    myEmacs = super.callPackage ./emacs.nix {
+      emacs = if stdenv.isDarwin then emacs25Macport else emacs;
+    };
+    nodejs = pkgs.nodejs-8_x;
   };
 
   allowUnfree = true;