From b62454fc80a4c7956440fbb259ab7eaa9da85896 Mon Sep 17 00:00:00 2001 From: langsjo Date: Fri, 9 May 2025 15:18:42 +0300 Subject: [PATCH 1/2] rmw: disable asan and ubsan from subproject The subproject "canfigger" has asan and ubsan enabled by default, this commit adds a flag for meson to disable them --- pkgs/by-name/rm/rmw/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix index f405ef621d92..67834a1d65f6 100644 --- a/pkgs/by-name/rm/rmw/package.nix +++ b/pkgs/by-name/rm/rmw/package.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { ncurses ]; + # The subproject "canfigger" has asan and ubsan enabled by default, disable it here + mesonFlags = [ + "-Dcanfigger:b_sanitize=none" + ]; + meta = with lib; { description = "Trashcan/ recycle bin utility for the command line"; homepage = "https://github.com/theimpossibleastronaut/rmw"; From b748223eacbac2cc57aa9eed43ef3dd3ac866d4e Mon Sep 17 00:00:00 2001 From: langsjo Date: Fri, 9 May 2025 15:19:54 +0300 Subject: [PATCH 2/2] rmw: add `gettext` to buildInputs for Darwin --- pkgs/by-name/rm/rmw/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix index 67834a1d65f6..84f5f602f0d0 100644 --- a/pkgs/by-name/rm/rmw/package.nix +++ b/pkgs/by-name/rm/rmw/package.nix @@ -6,6 +6,7 @@ ninja, pkg-config, ncurses, + gettext, }: stdenv.mkDerivation rec { @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext; # The subproject "canfigger" has asan and ubsan enabled by default, disable it here mesonFlags = [