summary refs log tree commit diff stats
path: root/nix
diff options
context:
space:
mode:
authorAlan Pearce2017-06-12 19:11:11 +0200
committerAlan Pearce2017-06-12 19:11:11 +0200
commitc1685df0853bcdb136ddb3216256937087441b60 (patch)
treec52f65d45002d3f0b1ce6d8f2d024abfe3173e6c /nix
parent60abb4d802d2bf55b8aac25e69d34c06096ad761 (diff)
downloadnixfiles-c1685df0853bcdb136ddb3216256937087441b60.tar.lz
nixfiles-c1685df0853bcdb136ddb3216256937087441b60.tar.zst
nixfiles-c1685df0853bcdb136ddb3216256937087441b60.zip
nix: Allow emacs package to be specified
Diffstat (limited to 'nix')
-rw-r--r--nix/.config/nixpkgs/emacs.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/.config/nixpkgs/emacs.nix b/nix/.config/nixpkgs/emacs.nix
index 96617362..1e439b6d 100644
--- a/nix/.config/nixpkgs/emacs.nix
+++ b/nix/.config/nixpkgs/emacs.nix
@@ -1,11 +1,11 @@
 {
   pkgs ? import <nixpkgs> {},
+  emacs ? pkgs.emacs,
   stdenv,
-  withMacPort ? stdenv.isDarwin
 }:
 
 let
-  myEmacs = if withMacPort then pkgs.emacs25Macport else pkgs.emacs;
+  myEmacs = emacs;
   emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages;
 
   elpaBuild = import <nixpkgs/pkgs/build-support/emacs/elpa.nix> {