From 3dc81e7578c9b42e0525e7318a1ad72f7d5e9e7b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 6 Apr 2024 16:12:14 +0200 Subject: [PATCH 1/2] radare2: fix on Darwin after update in #301660 (thanks @reckenrode) --- pkgs/development/tools/analysis/radare2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index e2852ccaa6d5..cf31badfb3fc 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -79,6 +79,12 @@ stdenv.mkDerivation rec { "-Dr2_gittap=${version}" ]; + # TODO: remove when upstream fixes the issue + # https://github.com/radareorg/radare2/issues/22793 + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-DTHREAD_CONVERT_THREAD_STATE_TO_SELF=1" + ]; + enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; From e2ae00c7d554a7fe33bbee366da5150db229444f Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Sun, 7 Apr 2024 01:38:32 +0000 Subject: [PATCH 2/2] Update pkgs/development/tools/analysis/radare2/default.nix Co-authored-by: Mario Rodas --- pkgs/development/tools/analysis/radare2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index cf31badfb3fc..61ac7bbfe464 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -81,9 +81,9 @@ stdenv.mkDerivation rec { # TODO: remove when upstream fixes the issue # https://github.com/radareorg/radare2/issues/22793 - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-DTHREAD_CONVERT_THREAD_STATE_TO_SELF=1" - ]; + ]); enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ];