public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: avoid rebuild from the parent commit for now

Browse Source 
Otherwise we'd be delaying this staging-next cycle noticeably.
This commit is contained in:
Vladimír Čunát 2020-06-08 06:27:16 +02:00
parent a239864fc6
commit b59847b848
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 0 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

@ -66,6 +66,9 @@ in stdenv.mkDerivation {
postPatch = '' postPatch = ''
substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
''
# TODO: unconditionalize on the next rebuild
+ stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace src/boot/efi/meson.build \ substituteInPlace src/boot/efi/meson.build \
--replace \ --replace \
"find_program('ld'" \ "find_program('ld'" \