From 5c68f7e94a1c7b5e0d027e261f183be93b7c57b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 11 May 2020 07:42:33 -0300 Subject: [PATCH 1/3] jgmenu: format with nixpkgs-fmt --- pkgs/applications/misc/jgmenu/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 46792588f4c..9db589b5215 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg, makeWrapper }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, python3Packages +, pango +, librsvg +, libxml2 +, menu-cache +, xorg +, makeWrapper +}: stdenv.mkDerivation rec { pname = "jgmenu"; @@ -27,7 +37,9 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ "prefix=${placeholder "out"}" ]; + makeFlags = [ + "prefix=${placeholder "out"}" + ]; postFixup = '' wrapPythonProgramsIn "$out/lib/jgmenu" From 3baa8c1bdcd32b73766782026bf9e14f01567908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 11 May 2020 08:26:07 -0300 Subject: [PATCH 2/3] jgmenu: no need to explicitly set prefix make flag It is automatically passed to the configure script. --- pkgs/applications/misc/jgmenu/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 9db589b5215..8588a05b122 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -37,10 +37,6 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ - "prefix=${placeholder "out"}" - ]; - postFixup = '' wrapPythonProgramsIn "$out/lib/jgmenu" for f in $out/bin/jgmenu{,_run}; do From be7b83b460a6b90367885340121c2edf2a016389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 11 May 2020 08:28:29 -0300 Subject: [PATCH 3/3] jgmenu: optionally install a xfce4 panel plugin - It is a contrib feature. - Default to false. --- pkgs/applications/misc/jgmenu/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 8588a05b122..12aece3ba55 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -8,6 +8,9 @@ , menu-cache , xorg , makeWrapper +, enableXfcePanelApplet ? false +, xfce +, gtk3 }: stdenv.mkDerivation rec { @@ -35,6 +38,16 @@ stdenv.mkDerivation rec { xorg.libXinerama xorg.libXrandr python3Packages.python + ] ++ stdenv.lib.optionals enableXfcePanelApplet [ + gtk3 + xfce.libxfce4util + xfce.xfce4-panel + ]; + + configureFlags = [ + ] + ++ stdenv.lib.optionals enableXfcePanelApplet [ + "--with-xfce4-panel-applet" ]; postFixup = ''