diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 09:02:04 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 09:03:30 +0000 |
| commit | fe1bd1a73c6943c9c21d6df1a02bc4698bf8878a (patch) | |
| tree | bb6fcb5e73f14937b5d8caf0fa8c80033f476f0f /pkgs/os-specific/linux/systemd | |
| parent | 49f12fe87873c541d4cbcf702aa10ae88c35b77a (diff) | |
| download | nixlib-fe1bd1a73c6943c9c21d6df1a02bc4698bf8878a.tar nixlib-fe1bd1a73c6943c9c21d6df1a02bc4698bf8878a.tar.gz nixlib-fe1bd1a73c6943c9c21d6df1a02bc4698bf8878a.tar.bz2 nixlib-fe1bd1a73c6943c9c21d6df1a02bc4698bf8878a.tar.lz nixlib-fe1bd1a73c6943c9c21d6df1a02bc4698bf8878a.tar.xz nixlib-fe1bd1a73c6943c9c21d6df1a02bc4698bf8878a.tar.zst nixlib-fe1bd1a73c6943c9c21d6df1a02bc4698bf8878a.zip | |
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).
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 85aa1153e9c2..1ced93c3c352 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 ]; |