From 089952b7f31a1b6ca040afaf76a9c4b390da1eac Mon Sep 17 00:00:00 2001 From: Astrid Yu Date: Fri, 24 May 2024 13:49:30 -0700 Subject: [PATCH 1/2] caligula: mark darwin as no longer broken --- pkgs/by-name/ca/caligula/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index a97fa34fd020..8deb9c61a113 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -35,8 +35,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Only; maintainers = with maintainers; [ ifd3f sodiboo ]; platforms = platforms.linux ++ platforms.darwin; - # https://github.com/ifd3f/caligula/issues/105 - broken = stdenv.hostPlatform.isDarwin; mainProgram = "caligula"; }; } From ba0c71b7dc5dddc6e55a58e0bc3b7d48b604786f Mon Sep 17 00:00:00 2001 From: Astrid Yu Date: Fri, 21 Jun 2024 17:59:49 -0700 Subject: [PATCH 2/2] caligula: add LIBCLANG_PATH to environment --- pkgs/by-name/ca/caligula/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index 8deb9c61a113..41fc669983d2 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, llvmPackages , stdenv , darwin }: @@ -18,6 +19,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ma7JVbWSiKfkCXCDwA8DFm2+KPrWR+8nSdgGSqehNg8="; + env = { + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + }; + + buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ Cocoa