nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 02:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

zellij: use versionCheckHook instead of passthru.tests.version

Browse Source
This commit is contained in:
Gaetan Lepage 2024-11-19 15:42:44 +01:00
parent d33fc745e4
commit 4dd5091bc4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/by-name/ze/zellij/package.nix
View File

@ -8,8 +8,7 @@
curl,
openssl,
mandown,
zellij,
testers,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
@ -49,9 +48,14 @@ rustPlatform.buildRustPackage rec {
HOME=$TMPDIR
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
# Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs
doInstallCheck = stdenv.hostPlatform.libc == "glibc";
installCheckPhase = ''
installCheckPhase = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
runHook preInstallCheck
ldd "$out/bin/zellij" | grep libcurl.so
@ -71,7 +75,6 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/zellij setup --generate-completion zsh)
'';
passthru.tests.version = testers.testVersion { package = zellij; };
meta = with lib; {
description = "Terminal workspace with batteries included";