From 5061ffb8c3f8ede7d050e5121fde6652d52d62a0 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 29 Oct 2023 23:02:43 +0300 Subject: [PATCH 1/2] libhugetlbfs: move broken to badPlatforms + update brokenness status --- pkgs/development/libraries/libhugetlbfs/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index 2ad7539ef1fd..f6662f7ffcfb 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -40,10 +40,14 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-docs" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "library and utilities for Linux hugepages"; maintainers = with maintainers; [ qyliss ]; license = licenses.lgpl21Plus; platforms = platforms.linux; + badPlatforms = [ + systems.inspect.platformPatterns.isStatic + systems.inspect.patterns.isMusl + systems.inspect.patterns.isAarch64 + ]; }; } From 334cdcb78fad7304acd59acb979b644a05a2c39c Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 29 Oct 2023 23:02:58 +0300 Subject: [PATCH 2/2] nvme-cli: only use libhugetlbfs if not broken --- pkgs/os-specific/linux/nvme-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 425fd1cc61e5..e0d0372fd6ff 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libnvme json_c zlib - ] ++ lib.optionals (!(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isMusl)) [ + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libhugetlbfs) [ libhugetlbfs ];