From fe1bd1a73c6943c9c21d6df1a02bc4698bf8878a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 24 Apr 2013 09:02:04 +0000 Subject: [PATCH] tarball: move assertion in systemd Now the assertion doesn't trigger on systemd.headers which is needed for dbus.libs. This should fix the tarball job (I don't have enough RAM to test it). --- pkgs/os-specific/linux/systemd/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 85aa1153e9c..1ced93c3c35 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,8 +3,6 @@ , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl }: -assert stdenv.gcc.libc or null != null; - stdenv.mkDerivation rec { version = "201"; name = "systemd-${version}"; @@ -25,7 +23,7 @@ stdenv.mkDerivation rec { ./0008-Don-t-try-to-unmount-nix-or-nix-store.patch ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; - buildInputs = + buildInputs = assert stdenv.gcc.libc or null != null; # assertion here, so it doesn't trigger on passthru.headers [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl ];