Unverified Commit b9a9eb10 authored by winston's avatar winston
Browse files

muon: unbreak on darwin

parent 624fe3e9

pkgs/by-name/mu/muon/darwin-clang.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
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;

pkgs/by-name/mu/muon/package.nix

+5 −1
Original line number Diff line number Diff line
@@ -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";

  };

})