From ef74fd873ab7cfa54d73c7f8e30b4d605cec5bab Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 14 Jul 2022 23:26:35 +0200 Subject: [PATCH] chickenPackages_4.chicken, chickenPackages_5.chicken: move makeWrapper to nativeBuildInputs --- pkgs/development/compilers/chicken/4/chicken.nix | 8 +++++--- pkgs/development/compilers/chicken/5/chicken.nix | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index 8ea522a81a92..1779d9c3ce54 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -39,11 +39,13 @@ stdenv.mkDerivation { ./0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch ]; - buildInputs = [ + nativeBuildInputs = [ makeWrapper - ] ++ (lib.optionals (bootstrap-chicken != null) [ + ]; + + buildInputs = lib.optionals (bootstrap-chicken != null) [ bootstrap-chicken - ]); + ]; preBuild = lib.optionalString (bootstrap-chicken != null) '' # Backup the build* files - those are generated from hostname, diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 32d8435e378d..0df2476c4ba2 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -31,11 +31,13 @@ stdenv.mkDerivation rec { "C_COMPILER=$(CC)" ]); - buildInputs = [ + nativeBuildInputs = [ makeWrapper - ] ++ (lib.optionals (bootstrap-chicken != null) [ + ]; + + buildInputs = lib.optionals (bootstrap-chicken != null) [ bootstrap-chicken - ]); + ]; postInstall = '' for f in $out/bin/*