Merge pull request #112352 from AndersonTorres/updates

Small updates
This commit is contained in:
Bernardo Meurer 2021-02-08 01:32:34 +00:00 committed by GitHub
commit 69aed000b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 21 deletions

View file

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/johanmalm/jgmenu";
description = "Small X11 menu intended to be used with openbox and tint2";
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
};

View file

@ -1,4 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, menu-cache }:
{ lib
, stdenv
, fetchurl
, pkg-config
, glib
, gtk2
, menu-cache
}:
stdenv.mkDerivation rec {
pname = "openbox-menu";
@ -12,11 +19,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gtk2 menu-cache ];
patches = [ ./with-svg.patch ];
# Enables SVG support by uncommenting the Makefile
patches = [ ./000-enable-svg.patch ];
installPhase = "make install prefix=$out";
installFlags = [ "prefix=${placeholder "out"}" ];
meta = {
meta = with lib; {
homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html";
description = "Dynamic XDG menu generator for Openbox";
longDescription = ''
@ -24,8 +32,8 @@ stdenv.mkDerivation rec {
dynamic menu listing installed applications. Most of the work is done by
the LXDE library menu-cache.
'';
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.romildo ];
platforms = lib.platforms.unix;
license = licenses.gpl3Plus;
maintainers = [ maintainers.romildo ];
platforms = platforms.unix;
};
}

View file

@ -1,14 +1,23 @@
{ lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala
{ lib
, stdenv
, fetchurl
, glib
, intltool
, menu-cache
, pango
, pkg-config
, vala
, extraOnly ? false
, withGtk3 ? false, gtk2, gtk3 }:
, withGtk3 ? true , gtk3, gtk2
}:
let
gtk = if withGtk3 then gtk3 else gtk2;
inherit (lib) optional;
in
stdenv.mkDerivation rec {
name = if extraOnly
then "libfm-extra-${version}"
else "libfm-${version}";
pname = if extraOnly
then "libfm-extra"
else "libfm";
version = "1.3.2";
src = fetchurl {
@ -17,16 +26,14 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ vala pkg-config intltool ];
buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache;
buildInputs = [ glib gtk pango ]
++ optional (!extraOnly) menu-cache;
configureFlags = [
"--sysconfdir=/etc"
] ++ optional extraOnly "--with-extra-only"
++ optional withGtk3 "--with-gtk=3";
configureFlags = [ "--sysconfdir=/etc" ]
++ optional extraOnly "--with-extra-only"
++ optional withGtk3 "--with-gtk=3";
installFlags = [
"sysconfdir=${placeholder "out"}/etc"
];
installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
# libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm
postInstall = optional (!extraOnly) ''