From ceb75e0f4008017fa82f1cad17e0748ff6ac0ee9 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Fri, 1 Aug 2025 11:38:54 -0400 Subject: [PATCH] treewide: Gate libgnurx behind 'isMinGW' --- pkgs/by-name/li/libpfm/package.nix | 2 +- pkgs/tools/misc/file/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpfm/package.nix b/pkgs/by-name/li/libpfm/package.nix index 8e6b5bc50cfe..b564b7ebebb4 100644 --- a/pkgs/by-name/li/libpfm/package.nix +++ b/pkgs/by-name/li/libpfm/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error"; env.CONFIG_PFMLIB_SHARED = if enableShared then "y" else "n"; - buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.libgnurx; + buildInputs = lib.optional stdenv.hostPlatform.isMinGW windows.libgnurx; meta = with lib; { description = "Helper library to program the performance monitoring events"; diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 77dd8f632906..3d423accffd0 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { updateAutotoolsGnuConfigScriptsHook ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; - buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; + buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW libgnurx; # https://bugs.astron.com/view.php?id=382 doCheck = !stdenv.buildPlatform.isMusl;