From 7503ee71fcbb2088d49f9736ded445f0dcf4e57a Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 24 Mar 2016 15:34:09 +0100 Subject: [PATCH] Revert "systemd: Try adding cryptsetup to buildInputs." This reverts commit eda8d21d8b0a69e4b7a3bc215e2215ffc6526495. --- pkgs/os-specific/linux/systemd/default.nix | 2 +- 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 7620fef0aa6..cb1521a4005 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 392ead817f0..65ca5c3a58d 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