diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2016-05-09 19:27:27 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-05-13 19:35:09 +0200 |
| commit | ec2ddf284d5d435f75a284cb3b840f15ab371741 (patch) | |
| tree | eda0611af360ab96e584439a59846d42d0e346ca /pkgs | |
| parent | 21efdd800358ded599f1d11acb0064ce9bff7f5d (diff) | |
| download | nixlib-ec2ddf284d5d435f75a284cb3b840f15ab371741.tar nixlib-ec2ddf284d5d435f75a284cb3b840f15ab371741.tar.gz nixlib-ec2ddf284d5d435f75a284cb3b840f15ab371741.tar.bz2 nixlib-ec2ddf284d5d435f75a284cb3b840f15ab371741.tar.lz nixlib-ec2ddf284d5d435f75a284cb3b840f15ab371741.tar.xz nixlib-ec2ddf284d5d435f75a284cb3b840f15ab371741.tar.zst nixlib-ec2ddf284d5d435f75a284cb3b840f15ab371741.zip | |
systemd: get linuxHeaders from stdenv
Building against anything other than the headers used to build libc doesn't really make any sense.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d6a928cd0cfd..3af702982fb6 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi , 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 , enableKDbus ? false }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b31b2b8c8fdb..a401ca24611e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11202,7 +11202,6 @@ in sysstat = callPackage ../os-specific/linux/sysstat { }; systemd = callPackage ../os-specific/linux/systemd { - linuxHeaders = linuxHeaders_3_18; utillinux = utillinuxMinimal; # break the cyclic dependency } // { |