diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/by-name/wl/wlogout/package.nix similarity index 58% rename from pkgs/tools/wayland/wlogout/default.nix rename to pkgs/by-name/wl/wlogout/package.nix index 96cabcc38e87..0107dbad89ba 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/by-name/wl/wlogout/package.nix @@ -1,15 +1,16 @@ { lib -, stdenv , fetchFromGitHub -, pkg-config -, meson -, ninja -, scdoc +, gitUpdater +, gtk-layer-shell , gtk3 , libxkbcommon +, meson +, ninja +, pkg-config +, scdoc +, stdenv , wayland , wayland-protocols -, gtk-layer-shell # gtk-layer-shell fails to cross-compile due to a hard dependency # on gobject-introspection. # Disable it when cross-compiling since it's an optional dependency. @@ -17,20 +18,30 @@ , withGtkLayerShell ? (stdenv.buildPlatform == stdenv.hostPlatform) }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wlogout"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ArtsyMacaw"; repo = "wlogout"; - rev = version; - hash = "sha256-xeTO8MBUrvcVA7WTRY7OhaVGInijuvXsVYEax8JmMZ0="; + rev = finalAttrs.version; + hash = "sha256-n8r+E6GXXjyDYBTOMiv5musamaUFSpRTM2qHgb047og="; }; - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config meson ninja scdoc ]; + outputs = [ "out" "man" ]; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + ]; + buildInputs = [ gtk3 libxkbcommon @@ -40,26 +51,32 @@ stdenv.mkDerivation rec { gtk-layer-shell ]; - postPatch = '' - substituteInPlace style.css \ - --replace "/usr/share/wlogout" "$out/share/${pname}" - - substituteInPlace main.c \ - --replace "/etc/wlogout" "$out/etc/${pname}" - ''; + strictDeps = true; mesonFlags = [ "--datadir=${placeholder "out"}/share" "--sysconfdir=${placeholder "out"}/etc" ]; - meta = with lib; { + postPatch = '' + substituteInPlace style.css \ + --replace "/usr/share/wlogout" "$out/share/wlogout" + + substituteInPlace main.c \ + --replace "/etc/wlogout" "$out/etc/wlogout" + ''; + + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { homepage = "https://github.com/ArtsyMacaw/wlogout"; description = "A wayland based logout menu"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + changelog = "https://github.com/ArtsyMacaw/wlogout/releases/tag/${finalAttrs.src.rev}"; + license = with lib.licenses; [ mit ]; mainProgram = "wlogout"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; }; -} -# TODO: shell completions +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddde3fe748e7..fe2642393297 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4829,8 +4829,6 @@ with pkgs; wleave = callPackage ../tools/wayland/wleave { }; - wlogout = callPackage ../tools/wayland/wlogout { }; - wlopm = callPackage ../tools/wayland/wlopm { }; wlprop = callPackage ../tools/wayland/wlprop { };