systemd: Drop dependency on cryptsetup for now

This is necessary to prevent a cyclic dependency.
flokli · Aug 16, 2012 · b06cb35 · b06cb35
1 parent 548365b
commit b06cb35
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig intltool gperf libcap dbus kmod xz pam acl
-      cryptsetup libuuid m4 usbutils pciutils glib
+      /* cryptsetup */ libuuid m4 usbutils pciutils glib
     ];
 
   configureFlags =
@@ -49,8 +49,7 @@ stdenv.mkDerivation rec {
       done
     '';
 
-  # ‘-fstack-protector’ is necessary to build the PAM module correctly.
-  NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\" -fstack-protector";
+  NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\" -fno-stack-protector";
 
   makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include";