diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-27 11:32:38 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-27 11:32:38 -0400 |
commit | cd7047c46169b935719ed5f19f693d97bd760ec7 (patch) | |
tree | 3f2799fcb9b652044d751758e6086d364805757f /pkgs/top-level | |
parent | 048724c4affebacbc4bd40d1a667ba6a7551fdd0 (diff) | |
parent | 26e8d58cb545004acb7cbd00db81a402923a2445 (diff) | |
download | nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.gz nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.bz2 nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.lz nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.xz nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.zst nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.zip |
Merge branch 'riscv-limitations'
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25a5305c81ba..546e4514a17f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3132,9 +3132,7 @@ with pkgs; keepalived = callPackage ../tools/networking/keepalived { }; - kexectools = if hostPlatform.isKexecable - then callPackage ../os-specific/linux/kexectools { } - else null; + kexectools = callPackage ../os-specific/linux/kexectools { }; keybase = callPackage ../tools/security/keybase { }; @@ -9795,9 +9793,7 @@ with pkgs; libgroove = callPackage ../development/libraries/libgroove { }; - libseccomp = if hostPlatform.isSeccomputable - then callPackage ../development/libraries/libseccomp { } - else null; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; |