ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

Revert "systemd: Try adding cryptsetup to buildInputs."

Browse Source 
This reverts commit eda8d21d8b0a69e4b7a3bc215e2215ffc6526495.
This commit is contained in:
Moritz Ulrich 2016-03-24 15:34:09 +01:00
parent 88e2cc480f
commit 7503ee71fc
2 changed files with 2 additions and 7 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

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

@ -10990,14 +10990,9 @@ 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 = appendToName "-with-cryptsetup" (systemd.override { # standalone cryptsetup generator for systemd
inherit cryptsetup;
});
# The standalone cryptsetup generator for systemd
systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { };
# 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