diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-14 18:01:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-14 18:01:28 +0000 |
commit | dd6646009ebea078f776852f4467bfeccfd9345f (patch) | |
tree | 88b61d74d3b001ce51c82ee50969de7855aa47f7 /pkgs/development/tools/misc | |
parent | 3cfacbe74f320e957e923d7cf89ed81ab60a0be5 (diff) | |
parent | 5baac4e1e3b77b0e4359a24bb6ab2a9829cb20f6 (diff) | |
download | nixlib-dd6646009ebea078f776852f4467bfeccfd9345f.tar nixlib-dd6646009ebea078f776852f4467bfeccfd9345f.tar.gz nixlib-dd6646009ebea078f776852f4467bfeccfd9345f.tar.bz2 nixlib-dd6646009ebea078f776852f4467bfeccfd9345f.tar.lz nixlib-dd6646009ebea078f776852f4467bfeccfd9345f.tar.xz nixlib-dd6646009ebea078f776852f4467bfeccfd9345f.tar.zst nixlib-dd6646009ebea078f776852f4467bfeccfd9345f.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/catppuccin-catwalk/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/tools/misc/ztags/default.nix | 12 |
2 files changed, 23 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/catppuccin-catwalk/default.nix b/pkgs/development/tools/misc/catppuccin-catwalk/default.nix index e19ed72222f7..2abf3823269b 100644 --- a/pkgs/development/tools/misc/catppuccin-catwalk/default.nix +++ b/pkgs/development/tools/misc/catppuccin-catwalk/default.nix @@ -1,7 +1,10 @@ -{ lib +{ stdenv +, lib , fetchFromGitHub , rustPlatform , installShellFiles +, pkg-config +, libwebp }: rustPlatform.buildRustPackage { @@ -18,7 +21,8 @@ rustPlatform.buildRustPackage { buildAndTestSubdir = "catwalk"; cargoHash = "sha256-KoxivYLzJEjWbxIkizrMpmVwUF7bfVxl13H774lzQRg="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; + buildInputs = [ libwebp ]; postInstall = '' installShellCompletion --cmd catwalk \ @@ -27,6 +31,14 @@ rustPlatform.buildRustPackage { --fish <("$out/bin/catwalk" completion fish) ''; + doInstallCheck = !stdenv.hostPlatform.isStatic && + stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.elf; + installCheckPhase = '' + runHook preInstallCheck + readelf -a $out/bin/catwalk | grep -F 'Shared library: [libwebp.so' + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/catppuccin/toolbox/tree/main/catwalk"; description = "A CLI for Catppuccin that takes in four showcase images and displays them all at once"; diff --git a/pkgs/development/tools/misc/ztags/default.nix b/pkgs/development/tools/misc/ztags/default.nix index 5106ad68fcaa..25010cc0cc67 100644 --- a/pkgs/development/tools/misc/ztags/default.nix +++ b/pkgs/development/tools/misc/ztags/default.nix @@ -1,24 +1,30 @@ { lib , stdenv , fetchFromGitHub +, scdoc , zig_0_11 }: stdenv.mkDerivation { pname = "ztags"; - version = "unstable-2023-08-29"; + version = "unstable-2023-09-07"; src = fetchFromGitHub { owner = "gpanders"; repo = "ztags"; - rev = "87dbc4ba7993fa1537ddce942c6ce4cf90ce0809"; - hash = "sha256-FZZZnTmz4mxhiRXs16A41fz0WYIg6oGM7xj2cECRkrM="; + rev = "6cdbd6dcdeda0d1ab9ad30261000e3d21b2407e6"; + hash = "sha256-lff5L7MG8RJdJM/YebJKDkKfkG4oumC0HytiCUOUG5Q="; }; nativeBuildInputs = [ + scdoc zig_0_11.hook ]; + postInstall = '' + zig build docs --prefix $out + ''; + meta = with lib; { description = "Generate tags files for Zig projects"; homepage = "https://github.com/gpanders/ztags"; |