summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2022-06-10 08:34:39 -0300
committerGitHub <noreply@github.com>2022-06-10 13:34:39 +0200
commit33d84e02ee99fbb5254ad0daadfdc5ddad1d4241 (patch)
tree57f146705a17c7e803a21430f685a8606ac53cb6
parent1c69f9896c4b80b3f1d44e79c6602aad96b5c3e7 (diff)
downloadnixpkgs-33d84e02ee99fbb5254ad0daadfdc5ddad1d4241.tar
nixpkgs-33d84e02ee99fbb5254ad0daadfdc5ddad1d4241.tar.gz
nixpkgs-33d84e02ee99fbb5254ad0daadfdc5ddad1d4241.tar.bz2
nixpkgs-33d84e02ee99fbb5254ad0daadfdc5ddad1d4241.tar.lz
nixpkgs-33d84e02ee99fbb5254ad0daadfdc5ddad1d4241.tar.xz
nixpkgs-33d84e02ee99fbb5254ad0daadfdc5ddad1d4241.tar.zst
nixpkgs-33d84e02ee99fbb5254ad0daadfdc5ddad1d4241.zip
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
-rw-r--r--pkgs/applications/misc/xdgmenumaker/default.nix34
1 files 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 ];