diff options
| author | toonn <toonn@toonn.io> | 2024-05-01 19:46:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 19:46:44 +0200 |
| commit | 6b39739b77c4ab3f39ee3276677ce94af3e2b39c (patch) | |
| tree | ddbc883269cfd248c740251c07f78d009c1d64db | |
| parent | f30177387a18ed3ccaf5aa081ecd3434056b5f4f (diff) | |
| parent | d281f7e4f4261d109f6397d5b1205f2873e8c072 (diff) | |
Merge pull request #306695 from reckenrode/icoutils-ld64
icoutils: fix build with newer ld64
| -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 b450537b5a42..0e22fe72c594 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 |