From 95ca9d00a2c8d61f429b477247b73655af0831a9 Mon Sep 17 00:00:00 2001 From: strawberry Date: Sun, 2 Jun 2024 21:08:52 +0000 Subject: [PATCH] nix: get all features from main crate --- nix/pkgs/main/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nix/pkgs/main/default.nix b/nix/pkgs/main/default.nix index 86595691..f91a9cdd 100644 --- a/nix/pkgs/main/default.nix +++ b/nix/pkgs/main/default.nix @@ -23,8 +23,6 @@ let # We perform default-feature unification in nix, because some of the dependencies # on the nix side depend on feature values. -workspaceMembers = builtins.map (member: "${inputs.self}/src/${member}") - (builtins.attrNames (builtins.readDir "${inputs.self}/src")); crateFeatures = path: let manifest = lib.importTOML "${path}/Cargo.toml"; in lib.remove "default" (lib.attrNames manifest.features) ++ @@ -34,10 +32,8 @@ crateFeatures = path: manifest.dependencies); crateDefaultFeatures = path: (lib.importTOML "${path}/Cargo.toml").features.default; -allDefaultFeatures = lib.unique - (lib.flatten (builtins.map crateDefaultFeatures workspaceMembers)); -allFeatures = lib.unique - (lib.flatten (builtins.map crateFeatures workspaceMembers)); +allDefaultFeatures = crateDefaultFeatures "${inputs.self}/src/main"; +allFeatures = crateFeatures "${inputs.self}/src/main"; features' = lib.unique (features ++ lib.optionals default_features allDefaultFeatures ++