From e757223addd03633c3ad9cef1bcd3d558cad1589 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 29 Aug 2025 16:43:45 +0800 Subject: [PATCH] review-shell: specify ignoreSingleFileOutputs = true whenever supported --- nixpkgs_review/nix/review-shell.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/nixpkgs_review/nix/review-shell.nix b/nixpkgs_review/nix/review-shell.nix index 7b0c318f..ff57cbee 100644 --- a/nixpkgs_review/nix/review-shell.nix +++ b/nixpkgs_review/nix/review-shell.nix @@ -26,11 +26,17 @@ let in map (attrString: lib.attrByPath (lib.splitString "." attrString) null system-pkg) system-attrs; attrs = lib.flatten (lib.mapAttrsToList extractPackagesForSystem (import attrs-path)); - env = local-pkgs.buildEnv { - name = "env"; - paths = attrs; - ignoreCollisions = true; - }; + supportIgnoreSingleFileOutputs = (lib.functionArgs local-pkgs.buildEnv) ? ignoreSingleFileOutputs; + env = local-pkgs.buildEnv ( + { + name = "env"; + paths = attrs; + ignoreCollisions = true; + } + // lib.optionalAttrs supportIgnoreSingleFileOutputs { + ignoreSingleFileOutputs = true; + } + ); in (import nixpkgs-path { }).mkShell { name = "review-shell";