Merge pull request #62821 from romildo/upd.jgmenu

jgmenu: 1.1 -> 3.0
This commit is contained in:
Maximilian Bosch 2019-06-10 00:15:35 +02:00 committed by GitHub
commit eb09ec0ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 { stdenv.mkDerivation rec {
name = "jgmenu-${version}"; pname = "jgmenu";
version = "1.1"; version = "3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johanmalm"; owner = "johanmalm";
repo = "jgmenu"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz"; sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
makeWrapper
python3Packages.wrapPython python3Packages.wrapPython
]; ];
@ -22,12 +23,17 @@ stdenv.mkDerivation rec {
libxml2 libxml2
menu-cache menu-cache
xorg.libXinerama xorg.libXinerama
xorg.libXrandr
python3Packages.python
]; ];
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=${placeholder "out"}" ];
postFixup = '' postFixup = ''
wrapPythonProgramsIn "$out/lib/jgmenu" wrapPythonProgramsIn "$out/lib/jgmenu"
for f in $out/bin/jgmenu{,_run}; do
wrapProgram $f --prefix PATH : $out/bin
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {