From 215b5f6282a02044b928a9a4fcf361beabba11ab Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 20 Mar 2016 00:36:36 +0100 Subject: [PATCH] systemd: Try adding cryptsetup to buildInputs. --- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index cb1521a4005..7620fef0aa6 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 dfb1d258ba3..d9507a18982 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