diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-03-24 15:34:09 +0100 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-04-08 14:50:20 +0200 |
| commit | 7503ee71fcbb2088d49f9736ded445f0dcf4e57a (patch) | |
| tree | 2fadc964643effde7647351a55086560ee9690c4 /pkgs | |
| parent | 88e2cc480f588be7514ea3953c42facd34e0f123 (diff) | |
| download | nixlib-7503ee71fcbb2088d49f9736ded445f0dcf4e57a.tar nixlib-7503ee71fcbb2088d49f9736ded445f0dcf4e57a.tar.gz nixlib-7503ee71fcbb2088d49f9736ded445f0dcf4e57a.tar.bz2 nixlib-7503ee71fcbb2088d49f9736ded445f0dcf4e57a.tar.lz nixlib-7503ee71fcbb2088d49f9736ded445f0dcf4e57a.tar.xz nixlib-7503ee71fcbb2088d49f9736ded445f0dcf4e57a.tar.zst nixlib-7503ee71fcbb2088d49f9736ded445f0dcf4e57a.zip | |
Revert "systemd: Try adding cryptsetup to buildInputs."
This reverts commit eda8d21d8b0a69e4b7a3bc215e2215ffc6526495.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7620fef0aa62..cb1521a4005e 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 392ead817f07..65ca5c3a58d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10990,14 +10990,9 @@ in systemd = callPackage ../os-specific/linux/systemd { linuxHeaders = linuxHeaders_3_18; - cryptsetup = null; # Infinite recusion }; - systemd_with_cryptsetup = appendToName "-with-cryptsetup" (systemd.override { - inherit cryptsetup; - }); - - # The standalone cryptsetup generator for systemd + # standalone cryptsetup generator for systemd systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get |