diff --git a/pkgs/by-name/xc/xclock/package.nix b/pkgs/by-name/xc/xclock/package.nix index ed01c2ba7cf6..965ed0f2d398 100644 --- a/pkgs/by-name/xc/xclock/package.nix +++ b/pkgs/by-name/xc/xclock/package.nix @@ -2,10 +2,10 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, meson, ninja, pkg-config, + versionCheckHook, wrapWithXFileSearchPathHook, libx11, libxaw, @@ -19,7 +19,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xclock"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -27,17 +27,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "app"; repo = "xclock"; tag = "xclock-${finalAttrs.version}"; - hash = "sha256-ZgUb+iVO45Az/C+2YJ1TXxcTLk3zQjM1GGv2E69WNfo="; + hash = "sha256-sytAl9vXBdxjTM0NnAgRNK34yqn/6zJeCQ/9bH3xaOc="; }; - patches = [ - # meson build system patch - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/app/xclock/-/commit/28e10bd26ac7e02fe8a4fb8016bb115f8d664032.patch"; - hash = "sha256-KdrS7VneJqwVPB+TRJoMmtR03Ju3PvvUMYfXz5tII6k="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -62,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "appdefaultdir" "${placeholder "out"}/share/X11/app-defaults") ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-version"; + doInstallCheck = true; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xclock-(.*)" ]; }; meta = { @@ -77,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { mit ]; mainProgram = "xclock"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ booxter ]; platforms = lib.platforms.unix; }; })