s6-linux-init: fix cross compilation v1 PROPOSED

Adam Joseph: 1
 s6-linux-init: fix cross compilation

 1 files changed, 16 insertions(+), 1 deletions(-)

[PATCH] s6-linux-init: fix cross compilation Export this patch

---
 .../skaware-packages/s6-linux-init/default.nix  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix
index fdb92aa3e2c6..cdb00e78cdd0 100644
--- a/pkgs/development/skaware-packages/s6-linux-init/default.nix
+++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix
@@ -1,4 +1,11 @@
-{ lib, skawarePackages, skalibs, execline, s6 }:
+{ lib
+, stdenv
+, skawarePackages
+, skalibs
+, execline
+, s6
+, targetPackages
+}:
 
 skawarePackages.buildPackage {
   pname = "s6-linux-init";
@@ -25,6 +32,14 @@ skawarePackages.buildPackage {
     "--with-dynlib=${s6.out}/lib"
   ];
 
+  # See ../s6-rc/default.nix for an explanation
+  postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
+    substituteInPlace src/init/s6-linux-init-maker.c \
+        --replace '<execline/config.h>' '"${targetPackages.execline.dev}/include/execline/config.h"' \
+        --replace '<s6/config.h>' '"${targetPackages.s6.dev}/include/s6/config.h"' \
+        --replace '<s6-linux-init/config.h>' '"${targetPackages.s6-linux-init.dev}/include/s6-linux-init/config.h"'
+  '';
+

sternenseemann <sternenseemann@systemli.org>

1 year, 13 days ago

Note that I've updated these to use `--replace-fail` which can't cause 
any harm, I think.

   postInstall = ''
     # remove all s6 executables from build directory
     rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
-- 
2.42.0

sternenseemann <sternenseemann@systemli.org>

1 year, 13 days ago

Submitted as <https://github.com/NixOS/nixpkgs/pull/304508>. Looks good 
to me, but I'll wait for another review, as I've never used 
s6-linux-init nor really know how it works.