systemd: 243.7 -> 244.3

This required some changes in how we treat DEFAULT_PATH_NORMAL.
This commit is contained in:
Florian Klink
2020-04-17 00:30:51 +02:00
parent b4cbcba5b1
commit 9de0ac3770
7 changed files with 87 additions and 76 deletions
+9 -4
View File
@@ -7,6 +7,7 @@
, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
, ninja, meson, python3Packages, glibcLocales
, patchelf
, substituteAll
, getent
, buildPackages
, perl
@@ -30,7 +31,7 @@ let gnupg-minimal = gnupg.override {
bzip2 = null;
};
in stdenv.mkDerivation {
version = "243.7";
version = "244.3";
pname = "systemd";
# When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@@ -38,8 +39,8 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd-stable";
rev = "f8dd0f2f15a566ede668c59e3c810c61f9d62c51";
sha256 = "1alvvciddg36by1bgzi8aarnms4crzqqyizj3nhlddh35pgpwvdk";
rev = "c4280c342bbf4fa8da833103482362236c18f835";
sha256 = "0y83nsrbdn0y3wfyfx53ac8c3wy9jrra86aaxix568vigi48g9zi";
};
patches = [
@@ -56,13 +57,17 @@ in stdenv.mkDerivation {
./0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
./0018-Install-default-configuration-into-out-share-factory.patch
./0019-inherit-systemd-environment-when-calling-generators.patch
./0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch
./0021-add-rootprefix-to-lookup-dir-paths.patch
./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
./0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch
./0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
];
postPatch = ''
substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
'';
outputs = [ "out" "lib" "man" "dev" ];
nativeBuildInputs =