From 4237fee22db7ee89d831e671073d9e2ab36dc59a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 19 Apr 2024 06:35:58 -0500 Subject: [PATCH] Revert "icu: refactor to avoid runtime dependency on bash" --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 -- pkgs/development/libraries/icu/make-icu.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 20bcb47dc571..a3a9980bc58f 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -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} diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index b130c346dbaa..836a7e3c73a6 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -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} '');