Skip to content

icu: enable updateAutotoolsGnuConfigScriptsHook #317218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7c6f434c merged 1 commit into from
Jun 5, 2024
Merged

icu: enable updateAutotoolsGnuConfigScriptsHook #317218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/icu/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, testers, buildPackages }:
{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, testers, buildPackages, updateAutotoolsGnuConfigScriptsHook }:

let
make-icu = (import ./make-icu.nix) {
inherit stdenv lib buildPackages fetchurl fixDarwinDylibNames testers;
inherit stdenv lib buildPackages fetchurl fixDarwinDylibNames testers updateAutotoolsGnuConfigScriptsHook;
};
in
{
Expand Down
10 changes: 6 additions & 4 deletions pkgs/development/libraries/icu/make-icu.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, buildPackages, fetchurl, fixDarwinDylibNames, testers }:
{ stdenv, lib, buildPackages, fetchurl, fixDarwinDylibNames, testers, updateAutotoolsGnuConfigScriptsHook }:

{ version, hash, patches ? [], patchFlags ? [], withStatic ? stdenv.hostPlatform.isStatic }:

Expand Down Expand Up @@ -64,9 +64,11 @@ let
outputs = [ "out" "dev" ] ++ lib.optional withStatic "static";
outputBin = "dev";

# FIXME: This fixes dylib references in the dylibs themselves, but
# not in the programs in $out/bin.
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] ++
# FIXME: This fixes dylib references in the dylibs themselves, but
# not in the programs in $out/bin.
lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;


# remove dependency on bootstrap-tools in early stdenv build
postInstall = lib.optionalString withStatic ''
Expand Down