diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-16 15:46:20 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-16 15:46:20 -0400 |
| commit | b06cb3578d4ec2b76dcf2ad04486f3a1420c6c72 (patch) | |
| tree | 90ed99d98a566cc6d05b84d70dd167f841caf879 /pkgs/os-specific/linux/systemd/default.nix | |
| parent | 548365b95c310fff8c7d3cfa57860db7f853e3c0 (diff) | |
| download | nixpkgs-b06cb3578d4ec2b76dcf2ad04486f3a1420c6c72.tar nixpkgs-b06cb3578d4ec2b76dcf2ad04486f3a1420c6c72.tar.gz nixpkgs-b06cb3578d4ec2b76dcf2ad04486f3a1420c6c72.tar.bz2 nixpkgs-b06cb3578d4ec2b76dcf2ad04486f3a1420c6c72.tar.lz nixpkgs-b06cb3578d4ec2b76dcf2ad04486f3a1420c6c72.tar.xz nixpkgs-b06cb3578d4ec2b76dcf2ad04486f3a1420c6c72.tar.zst nixpkgs-b06cb3578d4ec2b76dcf2ad04486f3a1420c6c72.zip | |
systemd: Drop dependency on cryptsetup for now
This is necessary to prevent a cyclic dependency.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index b6497e0b0b3..4cda7191e4a 100644 --- 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"; |