From f75a55389b1d193d4a439f1b644fddddcb107041 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 13 Sep 2024 10:59:20 +0200 Subject: [PATCH] nf-test: ensure makeWrapper is restricted to nativeBuildInputs This does not fix cross builds because not all dependencies can be built in cross, but it fixes eval error: makeWrapper/makeShellWrapper must be in nativeBuildInputs. --- pkgs/by-name/nf/nf-test/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/nf/nf-test/package.nix b/pkgs/by-name/nf/nf-test/package.nix index 81a5d52ee72b..ceea014962fa 100644 --- a/pkgs/by-name/nf/nf-test/package.nix +++ b/pkgs/by-name/nf/nf-test/package.nix @@ -18,14 +18,7 @@ stdenv.mkDerivation rec { }; sourceRoot = "."; - buildInputs = [ - makeWrapper - ]; - - nativeBuildInputs = [ - nextflow - ]; - + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -36,7 +29,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${openjdk11}/bin/java $out/bin/nf-test \ --add-flags "-jar $out/share/nf-test/nf-test.jar" \ - --prefix PATH : ${lib.makeBinPath nativeBuildInputs} \ + --prefix PATH : ${lib.makeBinPath [ nextflow ]} \ runHook postInstall '';