From 33d84e02ee99fbb5254ad0daadfdc5ddad1d4241 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Fri, 10 Jun 2022 08:34:39 -0300 Subject: xdgmenumaker: 1.5 -> 1.6 (#176568) * xdgmenumaker: format nix expression * xdgmenumaker: add update script * xdgmenumaker: fix license * xdgmenumaker: avoid double wrapping * xdgmenumaker: 1.5 -> 1.6 --- pkgs/applications/misc/xdgmenumaker/default.nix | 34 ++++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 00ae2df100e..357fa7f5964 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,20 +1,32 @@ -{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib +, fetchFromGitHub +, atk +, gdk-pixbuf +, gobject-introspection +, pango +, python3Packages +, txt2tags +, wrapGAppsHook +, gitUpdater +}: python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "gapan"; repo = pname; rev = version; - sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif"; + sha256 = "Q38m8YrvkkTCY2dByvPj+Ee1DMSUbWvwSDI0kW182bU="; }; format = "other"; strictDeps = false; + dontWrapGApps = true; + nativeBuildInputs = [ gobject-introspection txt2tags @@ -22,26 +34,30 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - glib + atk + gdk-pixbuf + pango ]; pythonPath = with python3Packages; [ - pyxdg pygobject3 + pyxdg ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - installFlags = [ - "DESTDIR=" - ]; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru.updateScript = gitUpdater {inherit pname version; }; meta = with lib; { description = "Command line tool that generates XDG menus for several window managers"; homepage = "https://github.com/gapan/xdgmenumaker"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch platforms = with platforms; filter (x: !(elem x darwin)) unix; maintainers = [ maintainers.romildo ]; -- cgit 1.4.1