cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

systemd: fix cross-compilation

Browse source 
Instead of patching the ld path, it's now specified as meson option
This commit is contained in:
Rick van Schijndel 2021-09-18 06:37:20 +02:00
parent 261c4ff0af
commit eabd03a551
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/systemd/default.nix
View file

@ -183,9 +183,6 @@ 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/"
substituteInPlace src/boot/efi/meson.build \ substituteInPlace src/boot/efi/meson.build \
--replace \
"find_program('ld'" \
"find_program('${stdenv.cc.bintools.targetPrefix}ld'" \
--replace \ --replace \
"find_program('objcopy'" \ "find_program('objcopy'" \
"find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'"
@ -408,6 +405,7 @@ stdenv.mkDerivation {
"-Dsmack=true" "-Dsmack=true"
"-Db_pie=true" "-Db_pie=true"
"-Dinstall-sysconfdir=false" "-Dinstall-sysconfdir=false"
"-Defi-ld=${stdenv.cc.bintools.targetPrefix}ld"
/* /*
As of now, systemd doesn't allow runtime configuration of these values. So As of now, systemd doesn't allow runtime configuration of these values. So
the settings in /etc/login.defs have no effect on it. Many people think this the settings in /etc/login.defs have no effect on it. Many people think this