summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-03-27 11:32:38 -0400
committerShea Levy <shea@shealevy.com>2018-03-27 11:32:38 -0400
commitcd7047c46169b935719ed5f19f693d97bd760ec7 (patch)
tree3f2799fcb9b652044d751758e6086d364805757f /nixos
parent048724c4affebacbc4bd40d1a667ba6a7551fdd0 (diff)
parent26e8d58cb545004acb7cbd00db81a402923a2445 (diff)
downloadnixpkgs-cd7047c46169b935719ed5f19f693d97bd760ec7.tar
nixpkgs-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.gz
nixpkgs-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.bz2
nixpkgs-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.lz
nixpkgs-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.xz
nixpkgs-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.zst
nixpkgs-cd7047c46169b935719ed5f19f693d97bd760ec7.zip
Merge branch 'riscv-limitations'
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/system/boot/kexec.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 14ebe66e632..3fc1af28f62 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 {
-  config = lib.mkIf (pkgs.kexectools != null) {
+  config = lib.mkIf (pkgs.kexectools.meta.available) {
     environment.systemPackages = [ pkgs.kexectools ];
 
     systemd.services."prepare-kexec" =