From 94633e2449f98abbde01a8a4ad6c772d8500c790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 7 Jun 2019 08:45:36 -0300 Subject: [PATCH] jgmenu: 1.1 -> 3.0 --- pkgs/applications/misc/jgmenu/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index b868808ec3dc..6ba0bed78476 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg }: +{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg, makeWrapper }: stdenv.mkDerivation rec { - name = "jgmenu-${version}"; - version = "1.1"; + pname = "jgmenu"; + version = "3.0"; src = fetchFromGitHub { owner = "johanmalm"; - repo = "jgmenu"; + repo = pname; rev = "v${version}"; - sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz"; + sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl"; }; nativeBuildInputs = [ pkgconfig + makeWrapper python3Packages.wrapPython ]; @@ -22,12 +23,17 @@ stdenv.mkDerivation rec { libxml2 menu-cache xorg.libXinerama + xorg.libXrandr + python3Packages.python ]; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; postFixup = '' wrapPythonProgramsIn "$out/lib/jgmenu" + for f in $out/bin/jgmenu{,_run}; do + wrapProgram $f --prefix PATH : $out/bin + done ''; meta = with stdenv.lib; {