public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: Try adding cryptsetup to buildInputs.

Browse Source
This commit is contained in:
Moritz Ulrich 2016-03-20 00:36:36 +01:00
parent f1f79505fc
commit 215b5f6282
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/systemd/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl [ 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 libmicrohttpd kexectools libseccomp audit lz4 libapparmor
/* FIXME: we may be able to prevent the following dependencies /* FIXME: we may be able to prevent the following dependencies
by generating an autoconf'd tarball, but that's probably not by generating an autoconf'd tarball, but that's probably not

5
pkgs/top-level/all-packages.nix
View File

@ -10990,6 +10990,11 @@ in
systemd = callPackage ../os-specific/linux/systemd { systemd = callPackage ../os-specific/linux/systemd {
linuxHeaders = linuxHeaders_3_18; 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 # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get