From aca9ff2310744434766e242ac7eed0e2395af4ad Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 6 Oct 2024 16:13:15 +0800 Subject: [PATCH] colmena: pin to nix 2.18 --- pkgs/tools/admin/colmena/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix index 0ef27f2ee560..d9efd878bbce 100644 --- a/pkgs/tools/admin/colmena/default.nix +++ b/pkgs/tools/admin/colmena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, nix-eval-jobs +{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, makeBinaryWrapper, nix-eval-jobs, nixVersions , colmena, testers }: rustPlatform.buildRustPackage rec { @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rk2atWWJIR95duUXxAiARegjeCyfAsqTDwEr5P0eIr8="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeBinaryWrapper ]; buildInputs = [ nix-eval-jobs ]; @@ -25,6 +25,9 @@ rustPlatform.buildRustPackage rec { --bash <($out/bin/colmena gen-completions bash) \ --zsh <($out/bin/colmena gen-completions zsh) \ --fish <($out/bin/colmena gen-completions fish) + + wrapProgram $out/bin/colmena \ + --prefix PATH ":" "${lib.makeBinPath [ nixVersions.nix_2_18 ]}" ''; # Recursive Nix is not stable yet