diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-25 17:45:22 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-27 08:15:07 -0400 |
| commit | cdf9a78a3ebb535fa6ba88fce88c655776d2474f (patch) | |
| tree | 494af986a0c2adc37a3c6d1173a0dc563ae96174 /pkgs/os-specific | |
| parent | b0482248fefbf3b6cdd9c92053cfb49778a3a3a8 (diff) | |
| download | nixlib-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar nixlib-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.gz nixlib-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.bz2 nixlib-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.lz nixlib-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.xz nixlib-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.tar.zst nixlib-cdf9a78a3ebb535fa6ba88fce88c655776d2474f.zip | |
kexectools: Disable only on RISC-V if Linux.
The isKexecable flag treated Linux without kexec as just a normal variant, when it really should be treated as a special case incurring complexity debt to support.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kexectools/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index c4c5b7cc3b91..26f3d89c6628 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://horms.net/projects/kexec/kexec-tools; description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; + badPlatforms = platforms.riscv; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d0f35d6736da..763c28464ab3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -41,7 +41,8 @@ in stdenv.mkDerivation rec { buildInputs = [ linuxHeaders libcap kmod xz pam acl /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 - libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor + libmicrohttpd ] ++ stdenv.lib.meta.enableIfAvailable kexectools ++ + [ libseccomp libffi audit lz4 bzip2 libapparmor iptables gnu-efi # This is actually native, but we already pull it from buildPackages pythonLxmlEnv |