BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "systemd: avoid rebuild from the parent commit for now"

Browse source 
This reverts commit b59847b848.
This commit is contained in:
Vladimír Čunát 2020-06-10 08:53:44 +02:00
parent 2988780eb5
commit 02751f8843
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 0 additions and 3 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,9 +66,6 @@ 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'" \