diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-03-16 10:59:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-16 10:59:08 -0700 |
| commit | d0ce043a7e3bb8241f225274e7854bcffd54e52a (patch) | |
| tree | 4aec118c4da12468875c3b51792f493403cbf388 | |
| parent | 5ebdb3eda7e96ab9750a45091925434e0b18dfb2 (diff) | |
| parent | 489e9a864b2898157a6804cb101cb0b8b65949d4 (diff) | |
| download | nixlib-d0ce043a7e3bb8241f225274e7854bcffd54e52a.tar nixlib-d0ce043a7e3bb8241f225274e7854bcffd54e52a.tar.gz nixlib-d0ce043a7e3bb8241f225274e7854bcffd54e52a.tar.bz2 nixlib-d0ce043a7e3bb8241f225274e7854bcffd54e52a.tar.lz nixlib-d0ce043a7e3bb8241f225274e7854bcffd54e52a.tar.xz nixlib-d0ce043a7e3bb8241f225274e7854bcffd54e52a.tar.zst nixlib-d0ce043a7e3bb8241f225274e7854bcffd54e52a.zip | |
Merge pull request #296213 from donovanglover/hyprdim-hyprnome
hyprdim, hyprnome: cleanup
| -rw-r--r-- | pkgs/by-name/hy/hyprdim/package.nix (renamed from pkgs/applications/misc/hyprdim/default.nix) | 21 | ||||
| -rw-r--r-- | pkgs/by-name/hy/hyprnome/package.nix (renamed from pkgs/applications/misc/hyprnome/default.nix) | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 20 insertions, 26 deletions
diff --git a/pkgs/applications/misc/hyprdim/default.nix b/pkgs/by-name/hy/hyprdim/package.nix index 10938330196a..ee0df4f9fc03 100644 --- a/pkgs/applications/misc/hyprdim/default.nix +++ b/pkgs/by-name/hy/hyprdim/package.nix @@ -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 { }; diff --git a/pkgs/applications/misc/hyprnome/default.nix b/pkgs/by-name/hy/hyprnome/package.nix index d8d6ba70c8f7..691ebc574a43 100644 --- a/pkgs/applications/misc/hyprnome/default.nix +++ b/pkgs/by-name/hy/hyprnome/package.nix @@ -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 { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67b68f6cf669..50c4c1afa203 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |