dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #321426 from ifd3f/caligula/mark-nonbroken-darwin

Browse Source 
caligula: mark darwin as no longer broken
This commit is contained in:
Marcus Ramberg 2024-06-22 18:08:33 +02:00 committed by GitHub
commit 0445f6f541
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/by-name/ca/caligula/package.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, llvmPackages
, stdenv , stdenv
, darwin , darwin
}: }:
@ -18,6 +19,11 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-ma7JVbWSiKfkCXCDwA8DFm2+KPrWR+8nSdgGSqehNg8="; cargoHash = "sha256-ma7JVbWSiKfkCXCDwA8DFm2+KPrWR+8nSdgGSqehNg8=";
env = {
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
};
buildInputs = lib.optionals stdenv.isDarwin ( buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [ with darwin.apple_sdk.frameworks; [
Cocoa Cocoa
@ -35,8 +41,6 @@ rustPlatform.buildRustPackage rec {
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ ifd3f sodiboo ]; maintainers = with maintainers; [ ifd3f sodiboo ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
# https://github.com/ifd3f/caligula/issues/105
broken = stdenv.hostPlatform.isDarwin;
mainProgram = "caligula"; mainProgram = "caligula";
}; };
} }