From 9ec6f8fc9bb351c4ab47de9666763d602b9d68c2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 29 Mar 2022 00:38:38 -0500 Subject: [PATCH] fac-build: fix darwin build --- pkgs/development/tools/build-managers/fac/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index b6481c621e98..ae5a5b30146d 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, git }: +{ lib, stdenv, rustPlatform, fetchCrate, git, CoreServices }: rustPlatform.buildRustPackage rec { pname = "fac-build"; @@ -10,6 +10,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI="; }; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; # fac includes a unit test called ls_files_works which assumes it's @@ -40,7 +42,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://physics.oregonstate.edu/~roundyd/fac"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ dpercy ]; mainProgram = "fac"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fa2d5eb471a..fca9768b378d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34999,7 +34999,9 @@ with pkgs; unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; - fac-build = callPackage ../development/tools/build-managers/fac {}; + fac-build = callPackage ../development/tools/build-managers/fac { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; treefmt = callPackage ../development/tools/treefmt { };