Skip to content
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

darling: fix build #340323

Merged
merged 1 commit into from
Sep 8, 2024
Merged

darling: fix build #340323

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
19 changes: 18 additions & 1 deletion pkgs/applications/emulators/darling/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
, runCommandWith
, writeShellScript
, fetchFromGitHub
, fetchpatch
, nixosTests

, freetype
Expand Down Expand Up @@ -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
Expand Down