diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-03-20 14:37:38 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-03-20 14:52:22 +0100 |
| commit | a0a61c3e34873d02034cb804975ad2981328b5b4 (patch) | |
| tree | 151763ccc59c6c1853e51f903aff94a2878cd1e4 /nixos/modules/installer | |
| parent | ecce3a7bc9a35415b82169630d352abddf6bcdd2 (diff) | |
| download | nixlib-a0a61c3e34873d02034cb804975ad2981328b5b4.tar nixlib-a0a61c3e34873d02034cb804975ad2981328b5b4.tar.gz nixlib-a0a61c3e34873d02034cb804975ad2981328b5b4.tar.bz2 nixlib-a0a61c3e34873d02034cb804975ad2981328b5b4.tar.lz nixlib-a0a61c3e34873d02034cb804975ad2981328b5b4.tar.xz nixlib-a0a61c3e34873d02034cb804975ad2981328b5b4.tar.zst nixlib-a0a61c3e34873d02034cb804975ad2981328b5b4.zip | |
nixos-option: Disable on Nix >= 2.4 because it doesn't compile
This is needed when using the overlay from the Nix flake.
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 833865e99bb3..655d77db157d 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -42,7 +42,10 @@ let inherit (config.system.nixos-generate-config) configuration; }; - nixos-option = pkgs.callPackage ./nixos-option { }; + nixos-option = + if lib.versionAtLeast (lib.getVersion pkgs.nix) "2.4pre" + then null + else pkgs.callPackage ./nixos-option { }; nixos-version = makeProg { name = "nixos-version"; @@ -184,10 +187,9 @@ in nixos-install nixos-rebuild nixos-generate-config - nixos-option nixos-version nixos-enter - ]; + ] ++ lib.optional (nixos-option != null) nixos-option; system.build = { inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter; |