Skip to content

Commit

Permalink
Merge pull request #307691 from TomaSajt/uiua
Browse files Browse the repository at this point in the history
uiua: fix darwin build, format with nixfmt
  • Loading branch information
natsukium committed Apr 30, 2024
2 parents 815e6eb + 811be75 commit 748906d
Showing 1 changed file with 30 additions and 24 deletions.
54 changes: 30 additions & 24 deletions pkgs/by-name/ui/uiua/package.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
, audioSupport ? true
, darwin
, alsa-lib
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
pkg-config,
audioSupport ? true,
darwin,
alsa-lib,

# passthru.tests.run
, runCommand
, uiua
# passthru.tests.run
runCommand,
uiua,
}:

let
inherit (darwin.apple_sdk.frameworks) AppKit AudioUnit CoreServices;
in
rustPlatform.buildRustPackage rec {
pname = "uiua";
version = "0.10.3";
Expand All @@ -25,19 +29,17 @@ rustPlatform.buildRustPackage rec {

cargoHash = "sha256-R97KO3MYmtO9C1Hi9kU+1FDdbOCVQk+gwVXTTvbeok4=";

nativeBuildInputs = lib.optionals stdenv.isDarwin [
rustPlatform.bindgenHook
] ++ lib.optionals audioSupport [
pkg-config
];
nativeBuildInputs =
lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]
++ lib.optionals audioSupport [ pkg-config ];

buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
] ++ lib.optionals (audioSupport && stdenv.isDarwin) [
darwin.apple_sdk.frameworks.AudioUnit
] ++ lib.optionals (audioSupport && stdenv.isLinux) [
alsa-lib
];
buildInputs =
lib.optionals stdenv.isDarwin [
AppKit
CoreServices
]
++ lib.optionals (audioSupport && stdenv.isDarwin) [ AudioUnit ]
++ lib.optionals (audioSupport && stdenv.isLinux) [ alsa-lib ];

buildFeatures = lib.optional audioSupport "audio";

Expand All @@ -59,6 +61,10 @@ rustPlatform.buildRustPackage rec {
homepage = "https://www.uiua.org/";
license = lib.licenses.mit;
mainProgram = "uiua";
maintainers = with lib.maintainers; [ cafkafk tomasajt defelo ];
maintainers = with lib.maintainers; [
cafkafk
tomasajt
defelo
];
};
}

0 comments on commit 748906d

Please sign in to comment.