From 1fd867426d2bd8caed499f9f18b619fc26b9f38d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Sep 2012 11:57:52 +0200
Subject: [PATCH] systemd: fix build on 32 bit machines

---
 pkgs/os-specific/linux/systemd/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 752efed6b58..34409c296e9 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -13,7 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "0r0xz8dksacm20516kakqf6xchydhcc1lkvz3m75z1gbl6sa581g";
   };
 
-  patches = [ ./reexec.patch ];
+  patches = [ ./reexec.patch ] ++
+            # Remove this patch after the next update.
+            stdenv.lib.optional (stdenv.system == "i686-linux") (fetchurl {
+              url = "https://bugs.freedesktop.org/attachment.cgi?id=67621";
+	      name = "fix-32-bit-build.patch";
+	      sha256 = "1i4xn6lc6iapaasd2lz717b1zrq5ds5g18i7m509fgfwy7w7x95l";
+            });
 
   buildInputs =
     [ pkgconfig intltool gperf libcap dbus kmod xz pam acl