Merge pull request #131482 from SuperSandro2000/systemd
Co-authored-by: Florian Klink <flokli@flokli.de>
This commit is contained in:
commit
0d7cb690e7
@ -12,7 +12,6 @@
|
||||
, coreutils
|
||||
, gperf
|
||||
, getent
|
||||
, patchelf
|
||||
, glibcLocales
|
||||
, glib
|
||||
, substituteAll
|
||||
@ -90,7 +89,6 @@
|
||||
# name argument
|
||||
, pname ? "systemd"
|
||||
|
||||
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_42
|
||||
@ -113,10 +111,10 @@ assert withCryptsetup ->
|
||||
let
|
||||
wantCurl = withRemote || withImportd;
|
||||
|
||||
version = "247.6";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit version pname;
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "247.6";
|
||||
|
||||
# We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
|
||||
# This has proven to be less error-prone than the previous systemd fork.
|
||||
@ -267,15 +265,12 @@ stdenv.mkDerivation {
|
||||
|
||||
outputs = [ "out" "man" "dev" ];
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gperf
|
||||
ninja
|
||||
meson
|
||||
coreutils # meson calls date, stat etc.
|
||||
glibcLocales
|
||||
patchelf
|
||||
getent
|
||||
m4
|
||||
|
||||
@ -289,8 +284,7 @@ stdenv.mkDerivation {
|
||||
(buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ]))
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
buildInputs = [
|
||||
acl
|
||||
audit
|
||||
glib
|
||||
|
Loading…
Reference in New Issue
Block a user