From c1685df0853bcdb136ddb3216256937087441b60 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 12 Jun 2017 19:11:11 +0200
Subject: nix: Allow emacs package to be specified

---
 nix/.config/nixpkgs/emacs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nix')

diff --git a/nix/.config/nixpkgs/emacs.nix b/nix/.config/nixpkgs/emacs.nix
index 9661736..1e439b6 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> {
-- 
cgit 1.4.1