From 51a07b20cd6bd22a6d45471642f2a8ca68a1bfbc Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 5 Nov 2024 22:09:24 +0000 Subject: [PATCH] openbsd.mkDerivation: add `extraNativeBuildInputs` input Some packages require extra hooks or tools. Rather than overriding all of the nativeBuildInputs and needing to specify all of them, add a field so that we just need to specify inputs that are not always required. Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix index 44709f680884..0e0778d394a6 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix @@ -53,7 +53,7 @@ lib.makeOverridable ( install tsort lorder - ]; + ] ++ (attrs.extraNativeBuildInputs or [ ]); HOST_SH = stdenv'.shell; @@ -93,6 +93,6 @@ lib.makeOverridable ( dontBuild = true; } // lib.optionalAttrs stdenv'.hostPlatform.isStatic { NOLIBSHARED = true; } - // attrs + // (builtins.removeAttrs attrs [ "extraNativeBuildInputs" ]) ) )