From 153f1f1e45325a5f5cc170fe1c02e5cd1031543a Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 18 Jan 2023 19:39:56 -0500 Subject: [PATCH] macchina: fix darwin build, add figsoda as a maintainer --- pkgs/tools/misc/macchina/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 76d17ea02ef..0bde6b5baf5 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -1,10 +1,9 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , installShellFiles -, libiconv -, Foundation +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { @@ -25,12 +24,12 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - Foundation + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.DisplayServices ]; postInstall = '' - installShellCompletion target/completions/*.{bash,fish} + installManPage doc/macchina.{1,7} ''; meta = with lib; { @@ -38,6 +37,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Macchina-CLI/macchina"; changelog = "https://github.com/Macchina-CLI/macchina/releases/tag/v${version}"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ _414owen ]; + maintainers = with maintainers; [ _414owen figsoda ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 354fa60ea1e..ca402e57ccc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9467,9 +9467,7 @@ with pkgs; macchanger = callPackage ../os-specific/linux/macchanger { }; - macchina = callPackage ../tools/misc/macchina { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + macchina = callPackage ../tools/misc/macchina { }; madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang;