Merge pull request #296213 from donovanglover/hyprdim-hyprnome

hyprdim, hyprnome: cleanup
This commit is contained in:
Nick Cao 2024-03-16 10:59:08 -07:00 committed by GitHub
commit d0ce043a7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 26 deletions

View file

@ -1,8 +1,9 @@
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, nix-update-script
{
lib,
rustPlatform,
fetchFromGitHub,
installShellFiles,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
@ -18,17 +19,15 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-hgcGzRLB1L3yxJjw1ECDJPmbl1W+2OS4KDojclyVYrc=";
nativeBuildInputs = [
installShellFiles
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage target/man/hyprdim.1
installShellCompletion --cmd hyprdim \
--bash <(cat target/completions/hyprdim.bash) \
--fish <(cat target/completions/hyprdim.fish) \
--zsh <(cat target/completions/_hyprdim)
--bash target/completions/hyprdim.bash \
--fish target/completions/hyprdim.fish \
--zsh target/completions/_hyprdim
'';
passthru.updateScript = nix-update-script { };

View file

@ -1,8 +1,9 @@
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, nix-update-script
{
lib,
rustPlatform,
fetchFromGitHub,
installShellFiles,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
@ -18,17 +19,15 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-DpbRs97sr5wpJSrYF99ZiQ0SZOZdoQjfaLhKIAU95HA=";
nativeBuildInputs = [
installShellFiles
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage target/man/hyprnome.1
installShellCompletion --cmd hyprnome \
--bash <(cat target/completions/hyprnome.bash) \
--fish <(cat target/completions/hyprnome.fish) \
--zsh <(cat target/completions/_hyprnome)
--bash target/completions/hyprnome.bash \
--fish target/completions/hyprnome.fish \
--zsh target/completions/_hyprnome
'';
passthru.updateScript = nix-update-script { };

View file

@ -5631,8 +5631,6 @@ with pkgs;
hypr = callPackage ../applications/window-managers/hyprwm/hypr {
cairo = cairo.override { xcbSupport = true; }; };
hyprdim = callPackage ../applications/misc/hyprdim { };
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };
@ -5644,8 +5642,6 @@ with pkgs;
hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
hyprnome = callPackage ../applications/misc/hyprnome { };
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker {