summaryrefslogtreecommitdiff
path: root/modules/system/default.nix
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2016-12-19 21:09:10 +0100
committerDaiderd Jordan <daiderd@gmail.com>2016-12-19 21:09:10 +0100
commit58e4f7d0cffb675d3c2026efa936d33d86d7ee2a (patch)
tree3bc44deccc6b2b0c90c365bc087f66fed502e03d /modules/system/default.nix
parent807872e8f3f7402c7aa49cb3da6b9a763834fe7e (diff)
use nixpkgsVersion as default system.darwinLabel
Diffstat (limited to 'modules/system/default.nix')
-rw-r--r--modules/system/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 0e659bb..8b4a699 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -37,9 +37,9 @@ in
'';
};
- system.nixdarwinLabel = mkOption {
+ system.darwinLabel = mkOption {
type = types.str;
- default = "16.09";
+ default = pkgs.lib.nixpkgsVersion;
};
};
@@ -47,12 +47,12 @@ in
config = {
system.build.toplevel = stdenvNoCC.mkDerivation {
- name = "nixdarwin-system-${cfg.nixdarwinLabel}";
+ name = "darwin-system-${cfg.darwinLabel}";
preferLocalBuild = true;
activationScript = cfg.activationScripts.script.text;
activationUserScript = cfg.activationScripts.userScript.text;
- inherit (cfg) nixdarwinLabel;
+ inherit (cfg) darwinLabel;
buildCommand = ''
mkdir $out
@@ -77,7 +77,7 @@ in
echo -n "$systemConfig" > $out/systemConfig
- echo -n "$nixdarwinLabel" > $out/nixdarwin-version
+ echo -n "$darwinLabel" > $out/darwin-version
echo -n "$system" > $out/system
'';
};