nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-05 19:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

icu: enable updateAutotoolsGnuConfigScriptsHook

Browse Source
This commit is contained in:
Audrey Dutcher 2024-06-04 07:24:15 -07:00
parent 612b7cbb4b
commit 448a3c064c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/icu/default.nix
View File

@ -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
{

10
pkgs/development/libraries/icu/make-icu.nix
View File

@ -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 }:
@ -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 ''