diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/development/skaware-packages/s6-rc | |
parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/skaware-packages/s6-rc')
-rw-r--r-- | nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix index edfc12f23271..8ccdd867688f 100644 --- a/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix @@ -50,9 +50,9 @@ skawarePackages.buildPackage { # system we're cross-compiling for. postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' substituteInPlace src/s6-rc/s6-rc-compile.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-rc/config.h>' '"${targetPackages.s6-rc.dev}/include/s6-rc/config.h"' + --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-rc/config.h>' '"${targetPackages.s6-rc.dev}/include/s6-rc/config.h"' ''; postInstall = '' |