Merge pull request #304784 from zlepper/remove-bash-runtime-dep-from-libicu
icu: refactor to avoid runtime dependency on bash
This commit is contained in:
commit
763178063e
|
@ -453,6 +453,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||||
|
|
||||||
- The `erlang-ls` package no longer ships the `els_dap` binary as of v0.51.0.
|
- The `erlang-ls` package no longer ships the `els_dap` binary as of v0.51.0.
|
||||||
|
|
||||||
|
- `icu` no longer includes `install-sh` and `mkinstalldirs` in the shared folder.
|
||||||
|
|
||||||
## Other Notable Changes {#sec-release-24.05-notable-changes}
|
## Other Notable Changes {#sec-release-24.05-notable-changes}
|
||||||
|
|
||||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||||
|
|
|
@ -75,6 +75,8 @@ let
|
||||||
{ from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile
|
{ from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile
|
||||||
];
|
];
|
||||||
in ''
|
in ''
|
||||||
|
rm $out/share/icu/${version}/install-sh $out/share/icu/${version}/mkinstalldirs # Avoid having a runtime dependency on bash
|
||||||
|
|
||||||
substituteInPlace "$dev/bin/icu-config" \
|
substituteInPlace "$dev/bin/icu-config" \
|
||||||
${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements}
|
${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements}
|
||||||
'');
|
'');
|
||||||
|
|
Loading…
Reference in New Issue
Block a user