diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-16 18:00:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-16 18:00:57 +0000 |
| commit | feedc73bee3d3f83b85d36c91f4bd4ff16fcfe43 (patch) | |
| tree | dc2119ca420481a2e6072eea0f98a818de5be579 /pkgs/development/skaware-packages/s6-linux-init/default.nix | |
| parent | 736d06d6cfefaba0cf6e1c69b1b111d65d12dd4a (diff) | |
| parent | 4a04be9a3cb62d6e6f70d08b34a04b7890ba2084 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/skaware-packages/s6-linux-init/default.nix')
| -rw-r--r-- | pkgs/development/skaware-packages/s6-linux-init/default.nix | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix index fdb92aa3e2c69..0de3673717026 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-fail '<execline/config.h>' '"${targetPackages.execline.dev}/include/execline/config.h"' \ + --replace-fail '<s6/config.h>' '"${targetPackages.s6.dev}/include/s6/config.h"' \ + --replace-fail '<s6-linux-init/config.h>' '"${targetPackages.s6-linux-init.dev}/include/s6-linux-init/config.h"' + ''; + postInstall = '' # remove all s6 executables from build directory rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) |