alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

systemd: get linuxHeaders from stdenv

Browse source 
Building against anything other than the headers used to build libc
doesn't really make any sense.
This commit is contained in:
Joachim Fasting 2016-05-09 19:27:27 +02:00
parent 21efdd8003
commit ec2ddf284d
No known key found for this signature in database
GPG key ID: 4330820E1E04DCF4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/os-specific/linux/systemd/default.nix
View file

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod { stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
, kexectools, libmicrohttpd, linuxHeaders, libseccomp, iptables , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
, iptables
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
, enableKDbus ? false , enableKDbus ? false
}: }:

1
pkgs/top-level/all-packages.nix
View file

@ -11202,7 +11202,6 @@ in
sysstat = callPackage ../os-specific/linux/sysstat { }; sysstat = callPackage ../os-specific/linux/sysstat { };
systemd = callPackage ../os-specific/linux/systemd { systemd = callPackage ../os-specific/linux/systemd {
linuxHeaders = linuxHeaders_3_18;
utillinux = utillinuxMinimal; # break the cyclic dependency utillinux = utillinuxMinimal; # break the cyclic dependency
} }
// { // {