From c3784eb94b6aaa93af287a8a237d6fb97b409718 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 13 Feb 2023 20:19:57 +0100 Subject: [PATCH] rubyfmt: add support for macos arm64/x86 --- pkgs/development/tools/rubyfmt/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index 177444370ad8..6cf2324b1d41 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , autoconf @@ -6,7 +7,13 @@ , bison , ruby , zlib +, readline +, libiconv +, libobjc +, libunwind , libxcrypt +, Foundation +, Security }: rustPlatform.buildRustPackage rec { @@ -31,8 +38,22 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zlib libxcrypt + ] ++ lib.optionals stdenv.isDarwin [ + readline + libiconv + libobjc + libunwind + Foundation + Security ]; + preConfigure = '' + pushd librubyfmt/ruby_checkout + autoreconf --install --force --verbose + ./configure + popd + ''; + cargoPatches = [ # The 0.8.1 release did not have an up-to-date lock file. The rubyfmt # version in Cargo.toml was bumped, but it wasn't updated in the lock file. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a691e3d895e..91f164096b57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17863,7 +17863,10 @@ with pkgs; rbenv = callPackage ../development/ruby-modules/rbenv { }; - rubyfmt = callPackage ../development/tools/rubyfmt { }; + rubyfmt = callPackage ../development/tools/rubyfmt { + inherit (darwin.apple_sdk.frameworks) Foundation Security; + inherit (darwin) libobjc; + }; inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libobjc libunwind;