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

systemd: Add libgcrypt dependency

Browse Source 
This is required for forward secure sealing of the journal.
This commit is contained in:
Eelco Dolstra 2012-10-11 12:33:47 -04:00
parent 2fa1b38853
commit bf5967e77e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils
, glib, kbd, libxslt, coreutils , glib, kbd, libxslt, coreutils, libgcrypt
}: }:
assert stdenv.gcc.libc or null != null; assert stdenv.gcc.libc or null != null;
@ -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 libxslt /* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt libgcrypt
]; ];
configureFlags = configureFlags =
@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
# lead to a cyclic dependency. # lead to a cyclic dependency.
"-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
"-fno-stack-protector" "-fno-stack-protector"
# Work around our kernel headers being too old. FIXME: remove
# this after the next stdenv update.
"-DFS_NOCOW_FL=0x00800000"
]; ];
makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include";