diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2024-04-23 07:47:13 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2024-04-24 22:55:15 -0400 |
| commit | d281f7e4f4261d109f6397d5b1205f2873e8c072 (patch) | |
| tree | 8be584cbdc8b8f2f35539642b3ce9a396eda8520 /pkgs/tools/graphics | |
| parent | 6421226aa5a59fa63aa43e8fc6d2d7ca33a26ca8 (diff) | |
icoutils: fix build with newer ld64
Since version 819.6, ld64 no longer supports static archives embedded in static archives.
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/icoutils/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index b450537b5a428..0e22fe72c5941 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { pname = "icoutils"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; - nativeBuildInputs = [ makeWrapper ]; + patches = [ + # Fixes a linker failure with newer versions of ld64 due to not supporting nested archives. + (fetchpatch { + url = "https://git.savannah.nongnu.org/cgit/icoutils.git/patch/?id=aa3572119bfe34484025f37dbbc4d5070f735908"; + hash = "sha256-4YCI+SYT2bCBNegkpN5jcfi6gOeec65TmCABr98HHB4="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook makeWrapper ]; buildInputs = [ libpng perl ]; propagatedBuildInputs = [ perlPackages.LWP ]; @@ -17,7 +25,7 @@ stdenv.mkDerivation rec { # upgrades to a newer SDK. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; - patchPhase = '' + postPatch = '' patchShebangs extresso/extresso patchShebangs extresso/extresso.in patchShebangs extresso/genresscript |