diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-09-12 22:21:55 -0300 |
---|---|---|
committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-10-11 23:42:04 -0300 |
commit | bde3f6a4b1013262ec089ff3f178e8784154ab19 (patch) | |
tree | 66aa51bfc002ea8ed95a330a124b74832c802642 | |
parent | 96179893343901726eb96937460fa090ca5518ce (diff) |
havoc: migrate to by-name
-rw-r--r-- | pkgs/by-name/ha/havoc/package.nix (renamed from pkgs/applications/terminal-emulators/havoc/default.nix) | 26 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/by-name/ha/havoc/package.nix index fa161a8147493..ed9f77ec56562 100644 --- a/pkgs/applications/terminal-emulators/havoc/default.nix +++ b/pkgs/by-name/ha/havoc/package.nix @@ -3,19 +3,19 @@ , fetchFromGitHub , libxkbcommon , pkg-config +, wayland , wayland-protocols , wayland-scanner -, wayland }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "havoc"; version = "0.5.0"; src = fetchFromGitHub { owner = "ii8"; - repo = pname; - rev = version; + repo = "havoc"; + rev = finalAttrs.version; hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4="; }; @@ -38,19 +38,19 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$$out" ]; postInstall = '' - install -D -m 644 havoc.cfg -t $out/etc/${pname}/ - install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/ + install -Dm 644 havoc.cfg -t $out/etc/havoc/ + install -Dm 644 README.md -t $out/share/doc/havoc-${finalAttrs.version}/ ''; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/ii8/havoc"; description = "A minimal terminal emulator for Wayland"; - license = with licenses; [ mit publicDomain ]; - platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; - # fatal error: 'sys/epoll.h' file not found - broken = stdenv.isDarwin; + license = with lib.licenses; [ mit publicDomain ]; + mainProgram = "havoc"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; + broken = stdenv.isDarwin; # fatal error: 'sys/epoll.h' file not found }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 959929351dc47..8095e1b2ef84f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3011,8 +3011,6 @@ with pkgs; guake = callPackage ../applications/terminal-emulators/guake { }; - havoc = callPackage ../applications/terminal-emulators/havoc { }; - hyper = callPackage ../applications/terminal-emulators/hyper { }; iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; |