diff options
| author | Alan Pearce | 2017-07-05 19:09:06 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-07-05 19:09:06 +0200 |
| commit | 60a00fda542594d6743df058923501f071bb2836 (patch) | |
| tree | b0bc899819d26af554dbc22fb01a5eafdc5fe605 /nix | |
| parent | 93f2165cb0a1ecaff5ca40784d5c88d18a3657b4 (diff) | |
| parent | 2e755628ac5c22bf5ce799a41c7bc5f9acbd0e44 (diff) | |
| download | dotfiles-60a00fda542594d6743df058923501f071bb2836.tar.lz dotfiles-60a00fda542594d6743df058923501f071bb2836.tar.zst dotfiles-60a00fda542594d6743df058923501f071bb2836.zip | |
Merge branch 'master' of ssh://alanpearce.eu/dotfiles
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/.config/nixpkgs/config.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nix/.config/nixpkgs/config.nix b/nix/.config/nixpkgs/config.nix index 3b50693..dc4e40a 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; |