diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:08:51 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:08:51 +0200 |
| commit | 8576d24b2ac27a216b6e32b167c258ae4f8bfe69 (patch) | |
| tree | 1681d9aeddb08a34c1e6fc49df025adc77d5fbf5 /pkgs/os-specific | |
| parent | 5f47c36752c167131d8e77e59b9374d7e0da7353 (diff) | |
| parent | dc33419285c09720de70fe8edf5434736a2462b9 (diff) | |
| download | nixlib-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar nixlib-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.gz nixlib-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.bz2 nixlib-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.lz nixlib-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.xz nixlib-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.tar.zst nixlib-8576d24b2ac27a216b6e32b167c258ae4f8bfe69.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 00a545ed3f54..722b4db9a80a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -66,6 +66,16 @@ in stdenv.mkDerivation { postPatch = '' 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 \ + --replace \ + "find_program('ld'" \ + "find_program('${stdenv.cc.bintools.targetPrefix}ld'" \ + --replace \ + "find_program('objcopy'" \ + "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" ''; outputs = [ "out" "lib" "man" "dev" ]; |