Unverified Commit 13f8bfc7 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #305290 from NixOS/revert-304784-remove-bash-runtime-dep-from-libicu 

Revert "icu: refactor to avoid runtime dependency on bash"
parents bd4ae0e1 4237fee2

nixos/doc/manual/release-notes/rl-2405.section.md

+0 −2
Original line number Diff line number Diff line
@@ -453,8 +453,6 @@ 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.



- `icu` no longer includes `install-sh` and `mkinstalldirs` in the shared folder.



## 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. -->

pkgs/development/libraries/icu/make-icu.nix

+0 −2
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ let 
        { from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile

      ];

    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" \

        ${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements}

    '');