diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:47:26 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:53:02 +0100 |
| commit | f9f6f41bff2213e199bded515e9b66d1e5c4d7dd (patch) | |
| tree | 29c5a75228e31f305f42c5b761709a186e406776 /pkgs/os-specific/linux/systemd | |
| parent | bbcf127c7c9029cba43493d7d25a9d1c65d59152 (diff) | |
| parent | 468f698f609e123bb0ffae67181d07ac99eb2204 (diff) | |
| download | nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.gz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.bz2 nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.lz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.xz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.zst nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.zip | |
Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4ca3f978798a..0e94b4ec1306 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,14 +3,11 @@ , glib, kbd, libxslt, coreutils, libgcrypt , kexectools, libmicrohttpd, linuxHeaders, libseccomp , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 -, pythonPackages ? null, pythonSupport ? false , enableKDbus ? false }: assert stdenv.isLinux; -assert pythonSupport -> pythonPackages != null; - stdenv.mkDerivation rec { version = "228"; name = "systemd-${version}"; @@ -18,8 +15,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "17c30663f79499ad0163c7ffe2c79e5c28525a6f"; - sha256 = "0jyqwqyh7l2qp7k4h83gzzp9bgijz0bx02jhd0063jcl1s2amlnh"; + rev = "b737c07cc0234acfa87282786025d556bca91c3f"; + sha256 = "0wca8zkn39914c232andvf3v0ni6ylv154kz3s9fcvg47rhpd5n1"; }; patches = [ ./hwdb-location.diff ]; @@ -40,7 +37,7 @@ stdenv.mkDerivation rec { by generating an autoconf'd tarball, but that's probably not worth it. */ autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 - ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml]; + ]; configureFlags = |