diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-03-20 00:36:36 +0100 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-04-08 14:50:20 +0200 |
| commit | 215b5f6282a02044b928a9a4fcf361beabba11ab (patch) | |
| tree | 652d2b53a7b15c79ae2238569ec027057ace77d5 /pkgs | |
| parent | f1f79505fc854a4eda421ab4d97d713bc6a2329b (diff) | |
| download | nixlib-215b5f6282a02044b928a9a4fcf361beabba11ab.tar nixlib-215b5f6282a02044b928a9a4fcf361beabba11ab.tar.gz nixlib-215b5f6282a02044b928a9a4fcf361beabba11ab.tar.bz2 nixlib-215b5f6282a02044b928a9a4fcf361beabba11ab.tar.lz nixlib-215b5f6282a02044b928a9a4fcf361beabba11ab.tar.xz nixlib-215b5f6282a02044b928a9a4fcf361beabba11ab.tar.zst nixlib-215b5f6282a02044b928a9a4fcf361beabba11ab.zip | |
systemd: Try adding cryptsetup to buildInputs.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index cb1521a4005e..7620fef0aa62 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libgpgerror + cryptsetup libuuid m4 glib libxslt libgcrypt libgpgerror libmicrohttpd kexectools libseccomp audit lz4 libapparmor /* FIXME: we may be able to prevent the following dependencies by generating an autoconf'd tarball, but that's probably not diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfb1d258ba3a..d9507a189820 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10990,6 +10990,11 @@ in systemd = callPackage ../os-specific/linux/systemd { linuxHeaders = linuxHeaders_3_18; + cryptsetup = null; # Infinite recusion + }; + + systemd-with-cryptsetup = systemd.override { + inherit cryptsetup; }; # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get |