diff options
| author | ghpzin <ghpzin@gmail.com> | 2024-09-07 09:28:03 +0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-09-08 17:37:09 +0000 |
| commit | f2823764cbccbe4c9c9c160955e5c1e364be92b2 (patch) | |
| tree | e6bb0a722eba519710d135eee1b364620e316aaf | |
| parent | [Backport release-24.05] outline: 0.78.0 -> 0.79.0 (#340143) (diff) | |
| download | nixpkgs-f2823764cbccbe4c9c9c160955e5c1e364be92b2.tar.gz | |
darling: fix buildorigin/backport-340323-to-release-24.05
- add patch from upstream commit fixing build error:
https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d
- add postPatch removing 500MB of dependency test files
to get under Hydra output limit
(cherry picked from commit 67876808fde4bb0aa92178944c99a061c18f8a2c)
| -rw-r--r-- | pkgs/applications/emulators/darling/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/applications/emulators/darling/default.nix b/pkgs/applications/emulators/darling/default.nix index a5fe1021e917..d66815df48b7 100644 --- a/pkgs/applications/emulators/darling/default.nix +++ b/pkgs/applications/emulators/darling/default.nix @@ -3,6 +3,7 @@ , runCommandWith , writeShellScript , fetchFromGitHub +, fetchpatch , nixosTests , freetype @@ -114,11 +115,27 @@ in stdenv.mkDerivation { repo = "darling"; rev = "25afbc76428c39c3909e9efcf5caef1140425211"; fetchSubmodules = true; - hash = "sha256-T0g38loUFv3jHvUu3R3QH9hwP8JVe2al4g4VhXnBDMc="; + hash = "sha256-z9IMgc5hH2Upn8wHl1OgP42q9HTSkeHnxB3N812A+Kc="; + # Remove 500MB of dependency test files to get under Hydra output limit + postFetch = '' + rm -r $out/src/external/openjdk/test + rm -r $out/src/external/libmalloc/tests + rm -r $out/src/external/libarchive/libarchive/tar/test + ''; }; outputs = [ "out" "sdk" ]; + patches = [ + # Fix 'clang: error: no such file or directory: .../signal/mach_excUser.c' + # https://github.com/darlinghq/darling/issues/1511 + # https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d + (fetchpatch { + url = "https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d.patch?full_index=1"; + hash = "sha256-FnLcHnK4cNto+E3OQSxE3iK+FHSU8y459FcpMvrzd6o="; + }) + ]; + postPatch = '' # We have to be careful - Patching everything indiscriminately # would affect Darwin scripts as well |