talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

treewide: Gate libgnurx behind 'isMinGW'

Browse Source
This commit is contained in:
Ross Smyth 2025-08-01 11:38:54 -04:00
parent a5056195ce
commit ceb75e0f40
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/by-name/li/libpfm/package.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
env.NIX_CFLAGS_COMPILE = "-Wno-error"; env.NIX_CFLAGS_COMPILE = "-Wno-error";
env.CONFIG_PFMLIB_SHARED = if enableShared then "y" else "n"; 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; { meta = with lib; {
description = "Helper library to program the performance monitoring events"; description = "Helper library to program the performance monitoring events";

2
pkgs/tools/misc/file/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
updateAutotoolsGnuConfigScriptsHook updateAutotoolsGnuConfigScriptsHook
] ]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; ++ 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 # https://bugs.astron.com/view.php?id=382
doCheck = !stdenv.buildPlatform.isMusl; doCheck = !stdenv.buildPlatform.isMusl;