ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 18:37:04 +03:00
Code Issues Projects Releases Wiki Activity

tarball: move assertion in systemd

Browse Source 
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).
This commit is contained in:
Vladimír Čunát 2013-04-24 09:02:04 +00:00
parent 49f12fe878
commit fe1bd1a73c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,6 @@
, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
}: }:
assert stdenv.gcc.libc or null != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "201"; version = "201";
name = "systemd-${version}"; name = "systemd-${version}";
@ -25,7 +23,7 @@ stdenv.mkDerivation rec {
./0008-Don-t-try-to-unmount-nix-or-nix-store.patch ./0008-Don-t-try-to-unmount-nix-or-nix-store.patch
] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.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 [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl
/* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
]; ];