diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/by-name/ma/mako/package.nix similarity index 69% rename from pkgs/applications/misc/mako/default.nix rename to pkgs/by-name/ma/mako/package.nix index 8c4e37661a8c..ad518f00e582 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -3,18 +3,17 @@ , wayland, wayland-protocols , wrapGAppsHook3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mako"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "emersion"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-sUFMcCrc5iNPeAmRbqDaT/n8OIlFJEwJTzY1HMx94RU="; + repo = "mako"; + rev = "refs/tags/v${finalAttrs.version}"; + sha256 = "sha256-QtYtondP7E5QXLRnmcaOQlAm9fKXctfjxeUFqK6FnnE="; }; - depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; @@ -29,12 +28,12 @@ stdenv.mkDerivation rec { ) ''; - meta = with lib; { + meta = { description = "A lightweight Wayland notification daemon"; homepage = "https://wayland.emersion.fr/mako/"; - license = licenses.mit; - maintainers = with maintainers; [ dywedir synthetica ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dywedir synthetica ]; + platforms = lib.platforms.linux; mainProgram = "mako"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58a24985d3c6..323c8fba6fcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32647,8 +32647,6 @@ with pkgs; makeself = callPackage ../applications/misc/makeself { }; - mako = callPackage ../applications/misc/mako { }; - mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; mapmap = libsForQt5.callPackage ../applications/video/mapmap { };