Version bump: libfm-1.2.2.1 and menu-cache-0.7.0

This commit is contained in:
Thomas Tuegel 2014-09-20 13:20:19 -05:00
parent 1cbcd2baae
commit cfcf643bb9
3 changed files with 22 additions and 11 deletions

View File

@ -1,13 +1,19 @@
{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala }: { stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala
, extraOnly ? false }:
let name = "libfm-1.2.2.1";
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libfm-1.2.0"; name = if extraOnly then "libfm-extra-1.2.2.1" else "libfm-1.2.2.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pcmanfm/libfm-1.2.0.tar.xz"; url = "mirror://sourceforge/pcmanfm/libfm-1.2.2.1.tar.xz";
sha256 = "08pwdrmfm9rl41lj2niyjqq2bdvydxk7v2shjxh5gk1xwj238lgh"; sha256 = "0aa37arr0h2nppjh7ppf00np2d8mb43imvfq9b7wq5cnzpvs7c6v";
}; };
buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ]; buildInputs = [ glib gtk intltool pango pkgconfig vala ]
++ optional (!extraOnly) menu-cache;
configureFlags = optional extraOnly "--with-extra-only";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://blog.lxde.org/?cat=28/"; homepage = "http://blog.lxde.org/?cat=28/";

View File

@ -1,13 +1,15 @@
{ stdenv, fetchurl, glib, pkgconfig }: { stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
let name = "menu-cache-0.7.0";
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "menu-cache-0.5.1"; inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/lxde/menu-cache-0.5.1.tar.gz"; url = "mirror://sourceforge/lxde/${name}.tar.xz";
sha256 = "08m1msgbl6j7j72cwcg18klb99jif8h1phkcnbplxkdf3w15irh8"; sha256 = "0wwkk4jrcl2sp11bspabplchh4ipi1zyn39j3skyzgbm8k40gkhk";
}; };
buildInputs = [ glib pkgconfig ]; buildInputs = [ glib pkgconfig libfm-extra ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://blog.lxde.org/?tag=menu-cache"; homepage = "http://blog.lxde.org/?tag=menu-cache";

View File

@ -5380,6 +5380,9 @@ let
libelf = callPackage ../development/libraries/libelf { }; libelf = callPackage ../development/libraries/libelf { };
libfm = callPackage ../development/libraries/libfm { }; libfm = callPackage ../development/libraries/libfm { };
libfm-extra = callPackage ../development/libraries/libfm {
extraOnly = true;
};
libgadu = callPackage ../development/libraries/libgadu { }; libgadu = callPackage ../development/libraries/libgadu { };