summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-10-11 12:33:47 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-10-11 12:33:47 -0400
commitbf5967e77e9c4cfc69501cc12a626cb5c6f22537 (patch)
treea9afa0f7c24a9c66f0fc40c779468c6679e49e48 /pkgs/os-specific/linux/systemd
parent2fa1b38853fc3c9eba02f47bf2d7031bf93e6f34 (diff)
downloadnixlib-bf5967e77e9c4cfc69501cc12a626cb5c6f22537.tar
nixlib-bf5967e77e9c4cfc69501cc12a626cb5c6f22537.tar.gz
nixlib-bf5967e77e9c4cfc69501cc12a626cb5c6f22537.tar.bz2
nixlib-bf5967e77e9c4cfc69501cc12a626cb5c6f22537.tar.lz
nixlib-bf5967e77e9c4cfc69501cc12a626cb5c6f22537.tar.xz
nixlib-bf5967e77e9c4cfc69501cc12a626cb5c6f22537.tar.zst
nixlib-bf5967e77e9c4cfc69501cc12a626cb5c6f22537.zip
systemd: Add libgcrypt dependency
This is required for forward secure sealing of the journal.
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 5abef22395e0..2219d82138f4 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , 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;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ 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 =
@@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
       # lead to a cyclic dependency.
       "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
       "-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";