mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-29 03:10:19 +00:00
muon: unbreak on darwin
This commit is contained in:
15
pkgs/by-name/mu/muon/darwin-clang.patch
Normal file
15
pkgs/by-name/mu/muon/darwin-clang.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
diff --git a/src/functions/kernel/dependency.c b/src/functions/kernel/dependency.c
|
||||
index fbfc86f6..46f9be9d 100644
|
||||
--- a/src/functions/kernel/dependency.c
|
||||
+++ b/src/functions/kernel/dependency.c
|
||||
@@ -377,10 +377,6 @@ get_dependency_extraframework(struct workspace *wk, struct dep_lookup_ctx *ctx,
|
||||
}
|
||||
|
||||
struct obj_compiler *comp = get_obj_compiler(wk, compiler);
|
||||
- if (comp->type[toolchain_component_compiler] != compiler_apple_clang) {
|
||||
- L("skipping extraframework dependency lookup: compiler type is not apple clang");
|
||||
- return true;
|
||||
- }
|
||||
|
||||
if (!comp->fwdirs) {
|
||||
obj cmd;
|
||||
@@ -74,6 +74,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
'';
|
||||
|
||||
patches = [ ./darwin-clang.patch ];
|
||||
|
||||
postPatch = ''
|
||||
find subprojects/meson-tests -name "*.py" -exec chmod +x {} \;
|
||||
patchShebangs .
|
||||
@@ -133,6 +135,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
${lib.optionalString (
|
||||
stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
|
||||
) "NIX_BUILD_CORES=1"}
|
||||
./stage-3/muon -C stage-3 test -d dots -S -j$NIX_BUILD_CORES
|
||||
|
||||
runHook postCheck
|
||||
@@ -152,7 +157,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin; # typical `ar failure`
|
||||
mainProgram = "muon";
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user