about summary refs log tree commit diff
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2023-10-29 23:15:59 +0300
committerGitHub <noreply@github.com>2023-10-29 23:15:59 +0300
commit4e43dd49630303b00120c11d00d4fb01bb40188d (patch)
tree61383364a819be841386e3347e59b4816f62d33d
parent3caa6623f18c0e7d4fe88c458d8b32439292e318 (diff)
parent334cdcb78fad7304acd59acb979b644a05a2c39c (diff)
downloadnixlib-4e43dd49630303b00120c11d00d4fb01bb40188d.tar
nixlib-4e43dd49630303b00120c11d00d4fb01bb40188d.tar.gz
nixlib-4e43dd49630303b00120c11d00d4fb01bb40188d.tar.bz2
nixlib-4e43dd49630303b00120c11d00d4fb01bb40188d.tar.lz
nixlib-4e43dd49630303b00120c11d00d4fb01bb40188d.tar.xz
nixlib-4e43dd49630303b00120c11d00d4fb01bb40188d.tar.zst
nixlib-4e43dd49630303b00120c11d00d4fb01bb40188d.zip
Merge pull request #264224 from K900/fix-nvme-cli-eval
nvme-cli: fix eval
-rw-r--r--pkgs/development/libraries/libhugetlbfs/default.nix6
-rw-r--r--pkgs/os-specific/linux/nvme-cli/default.nix2
2 files changed, 6 insertions, 2 deletions
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
+    ];
   };
 }
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
   ];