public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: Drop dependency on cryptsetup for now

Browse Source 
This is necessary to prevent a cyclic dependency.
This commit is contained in:
Eelco Dolstra 2012-08-16 15:46:20 -04:00
parent 548365b95c
commit b06cb3578d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/systemd/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl [ pkgconfig intltool gperf libcap dbus kmod xz pam acl
cryptsetup libuuid m4 usbutils pciutils glib /* cryptsetup */ libuuid m4 usbutils pciutils glib
]; ];
configureFlags = configureFlags =
@ -49,8 +49,7 @@ stdenv.mkDerivation rec {
done done
''; '';
# ‘-fstack-protector’ is necessary to build the PAM module correctly. NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\" -fno-stack-protector";
NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\" -fstack-protector";
makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include";