Unverified Commit 2adfe5c3 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #112366 from AndersonTorres/lxpanel

Small modification in LXDE and LXQT
parents b5f38caf 591f129c
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -9,10 +9,11 @@
}:

stdenv.mkDerivation rec {
  name = "lxappearance-0.6.3";
  pname = "lxappearance";
  version = "0.6.3";

  src = fetchurl {
    url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
    url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz";
    sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";
  };

@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Lightweight program for configuring the theme and fonts of gtk applications";
    homepage = "https://lxde.org/";
    license = licenses.gpl2;
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ hinton romildo ];
  };
+44 −11
Original line number Diff line number Diff line
{ lib, stdenv, fetchurl, pkg-config, gettext, m4, intltool, libxmlxx, keybinder
, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib
, menu-cache, lxmenu-data, wirelesstools, curl
{ lib
, stdenv
, fetchurl
, pkg-config
, gettext
, m4
, intltool
, libxmlxx
, keybinder
, gtk2
, libX11
, libfm
, libwnck
, libXmu
, libXpm
, cairo
, gdk-pixbuf
, gdk-pixbuf-xlib
, menu-cache
, lxmenu-data
, wirelesstools
, curl
, supportAlsa ? false, alsaLib
}:

stdenv.mkDerivation rec {
  name = "lxpanel-0.10.0";
  pname = "lxpanel";
  version = "0.10.0";

  src = fetchurl {
    url = "mirror://sourceforge/lxde/${name}.tar.xz";
    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
    sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26";
  };

  nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ];
  buildInputs = [
    keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev
    menu-cache lxmenu-data m4 wirelesstools curl
    keybinder
    gtk2
    libX11
    libfm
    libwnck
    libXmu
    libXpm
    cairo
    gdk-pixbuf
    gdk-pixbuf-xlib.dev
    menu-cache
    lxmenu-data
    m4
    wirelesstools
    curl
  ] ++ lib.optional supportAlsa alsaLib;

  postPatch = ''
@@ -25,11 +58,11 @@ stdenv.mkDerivation rec {
      --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
  '';

  meta = {
  meta = with lib; {
    description = "Lightweight X11 desktop panel for LXDE";
    homepage = "https://lxde.org/";
    license = lib.licenses.gpl2;
    maintainers = [ lib.maintainers.ryneeverett ];
    platforms = lib.platforms.linux;
    license = licenses.gpl2Plus;
    maintainers = [ maintainers.ryneeverett ];
    platforms = platforms.linux;
  };
}
+20 −6
Original line number Diff line number Diff line
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }:
{ lib
, stdenv
, fetchurl
, pkg-config
, intltool
, gtk2
, libX11
, xrandr
, withGtk3 ? false, gtk3
}:

stdenv.mkDerivation rec {
  name = "lxrandr-0.3.2";
  pname = "lxrandr";
  version = "0.3.2";

  src = fetchurl {
    url = "mirror://sourceforge/lxde/${name}.tar.xz";
    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
    sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb";
  };

  configureFlags = lib.optional withGtk3 "--enable-gtk3";

  nativeBuildInputs = [ pkg-config intltool ];
  buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ];
  buildInputs = [
    libX11
    xrandr
    (if withGtk3 then gtk3 else gtk2)
  ];

  meta = with lib; {
    description = "Standard screen manager of LXDE";
    homepage = "https://lxde.org/";
    license = lib.licenses.gpl2;
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ rawkode ];
    platforms = lib.platforms.linux;
    platforms = platforms.linux;
  };
}
+1 −1
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ stdenv.mkDerivation rec {
  preConfigure = "./autogen.sh";

  meta = with lib; {
    homepage = "https://wiki.lxde.org/en/LXSession";
    description = "Classic LXDE session manager";
    license = licenses.gpl2Plus;
    homepage = "https://wiki.lxde.org/en/LXSession";
    maintainers = [ maintainers.shamilton ];
    platforms = platforms.linux;
  };
+13 −6
Original line number Diff line number Diff line
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libintl }:
{ lib
, stdenv
, fetchurl
, pkg-config
, intltool
, gtk3
, libintl
}:

stdenv.mkDerivation rec {
  pname = "lxtask";
@@ -15,7 +22,8 @@ stdenv.mkDerivation rec {

  configureFlags = [ "--enable-gtk3" ];

  meta = {
  meta = with lib; {
    homepage = "https://wiki.lxde.org/en/LXTask";
    description = "Lightweight and desktop independent task manager";
    longDescription = ''
      LXTask is a lightweight task manager derived from xfce4 task manager
@@ -24,9 +32,8 @@ stdenv.mkDerivation rec {
      Desktop Environment, it's totally desktop independent and only
      requires pure GTK.
    '';
    homepage = "https://wiki.lxde.org/en/LXTask";
    license = lib.licenses.gpl2Plus;
    platforms = lib.platforms.unix;
    maintainers = [ lib.maintainers.romildo ];
    license = licenses.gpl2Plus;
    platforms = platforms.unix;
    maintainers = [ maintainers.romildo ];
  };
}
Loading