Unverified Commit f770149a authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

lxde: various updates / cleanup (#436105)

parents 1f7d0b60 7d927665

pkgs/by-name/li/libfm/package.nix

+11 −18
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  fetchFromGitHub,

  fetchpatch,

  autoreconfHook,

  gtk-doc,

  glib,

  intltool,

  menu-cache,
@@ -21,25 +23,21 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = if extraOnly then "libfm-extra" else "libfm";

  version = "1.3.2";

  version = "1.4.0";



  src = fetchurl {

    url = "mirror://sourceforge/pcmanfm/libfm-${finalAttrs.version}.tar.xz";

    sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU=";

  src = fetchFromGitHub {

    owner = "lxde";

    repo = "libfm";

    tag = finalAttrs.version;

    hash = "sha256-dmu5ygPuZe2YWAzIVPx5zskQeB51hXcLbMczxWgCr78=";

  };



  patches = [

    # Add casts to fix -Werror=incompatible-pointer-types

    (fetchpatch {

      url = "https://github.com/lxde/libfm/commit/fbcd183335729fa3e8dd6a837c13a23ff3271000.patch";

      hash = "sha256-RbX8jkP/5ao6NWEnv8Pgy4zwZaiDsslGlRRWdoV3enA=";

    })

  ];



  nativeBuildInputs = [

    autoreconfHook

    vala

    pkg-config

    intltool

    gtk-doc

  ];

  buildInputs = [

    glib
@@ -56,11 +54,6 @@ stdenv.mkDerivation (finalAttrs: { 


  installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];



  postPatch = ''

    # Ensure the files are re-generated from Vala sources.

    rm src/actions/*.c

  '';



  # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm

  postInstall = optionalString (!extraOnly) ''

    rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc

pkgs/by-name/lx/lxterminal/package.nix

+3 −9
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  automake,

  autoconf,

  autoreconfHook,

  intltool,

  pkg-config,

  gtk3,
@@ -26,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "lxde";

    repo = "lxterminal";

    tag = finalAttrs.version;

    sha256 = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U=";

    hash = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U=";

  };



  configureFlags = [
@@ -35,8 +34,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  nativeBuildInputs = [

    automake

    autoconf

    autoreconfHook

    intltool

    pkg-config

    wrapGAppsHook3
@@ -57,10 +55,6 @@ stdenv.mkDerivation (finalAttrs: { 
    ./respect-xml-catalog-files-var.patch

  ];



  preConfigure = ''

    ./autogen.sh

  '';



  doCheck = true;



  passthru.tests.test = nixosTests.terminal-emulators.lxterminal;

pkgs/by-name/me/menu-cache/package.nix

+19 −22
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  fetchpatch,

  fetchFromGitHub,

  glib,

  pkg-config,

  libfm-extra,

  autoreconfHook,

  gtk-doc,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "menu-cache";

  version = "1.1.0";

  version = "1.1.1";



  src = fetchurl {

    url = "mirror://sourceforge/lxde/menu-cache-${version}.tar.xz";

    sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd";

  src = fetchFromGitHub {

    owner = "lxde";

    repo = "menu-cache";

    tag = finalAttrs.version;

    hash = "sha256-5Vp2btrflimy+Hq+3MLpic/quZMJ3uwsMq12G7s4DGI=";

  };



  patches = [

    # Pull patch pending upstream inclusion for -fno-common toolchain support:

    #   https://github.com/lxde/menu-cache/pull/19

    (fetchpatch {

      name = "fno-common.patch";

      url = "https://github.com/lxde/menu-cache/commit/1ce739649b4d66339a03fc0ec9ee7a2f7c141780.patch";

      sha256 = "08x3h0w2pl8ifj83v9jkf4j3zxcwsyzh251divlhhnwx0rw1pyn7";

    })

  nativeBuildInputs = [

    autoreconfHook

    pkg-config

    gtk-doc

  ];



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [

    glib

    libfm-extra

  ];



  meta = with lib; {

  meta = {

    description = "Library to read freedesktop.org menu files";

    homepage = "https://blog.lxde.org/tag/menu-cache/";

    license = licenses.gpl2Plus;

    maintainers = [ maintainers.ttuegel ];

    platforms = platforms.linux ++ platforms.darwin;

    license = lib.licenses.gpl2Plus;

    maintainers = [ lib.maintainers.ttuegel ];

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

  };

}
 
})

pkgs/desktops/lxde/core/lxappearance/default.nix

+23 −11
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  fetchFromGitHub,

  autoreconfHook,

  intltool,

  pkg-config,

  libX11,

  gtk2,

  gtk3,

  libxslt,

  docbook_xsl,

  wrapGAppsHook3,

  withGtk3 ? true,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "lxappearance";

  version = "0.6.3";

  version = "0.6.4";



  src = fetchurl {

    url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz";

    sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";

  src = fetchFromGitHub {

    owner = "lxde";

    repo = "lxappearance";

    tag = finalAttrs.version;

    hash = "sha256-t5P3JYGZzhTaJ3s23r6yrAQoFcCV5uteHh67sWY1KrI=";

  };



  enableParallelBuilding = true;



  nativeBuildInputs = [

    pkg-config

    intltool

    wrapGAppsHook3

    autoreconfHook

    libxslt

    docbook_xsl

  ];



  buildInputs = [
@@ -35,14 +45,16 @@ stdenv.mkDerivation rec { 
    ./lxappearance-0.6.3-xdg.system.data.dirs.patch

  ];



  env.XSLTPROC = lib.getExe' libxslt "xsltproc";



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



  meta = with lib; {

  meta = {

    description = "Lightweight program for configuring the theme and fonts of gtk applications";

    mainProgram = "lxappearance";

    homepage = "https://lxde.org/";

    license = licenses.gpl2Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ romildo ];

    license = lib.licenses.gpl2Plus;

    platforms = lib.platforms.linux;

    maintainers = with lib.maintainers; [ romildo ];

  };

}
 
})

pkgs/desktops/lxde/core/lxmenu-data/default.nix

+18 −8
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  fetchFromGitHub,

  autoreconfHook,

  intltool,

  pkg-config,

  glib,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "lxmenu-data";

  version = "0.1.5";

  version = "0.1.6";



  src = fetchurl {

    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";

    sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";

  src = fetchFromGitHub {

    owner = "lxde";

    repo = "lxmenu-data";

    tag = finalAttrs.version;

    hash = "sha256-5QdQ+7nzj7wDrfdt4GT8VW4+sHgZdE7h3cReY2pmcak=";

  };



  nativeBuildInputs = [ intltool ];

  nativeBuildInputs = [

    autoreconfHook

    intltool

    pkg-config

    glib

  ];



  meta = {

    homepage = "https://lxde.org/";
@@ -22,4 +32,4 @@ stdenv.mkDerivation rec { 
    description = "Freedesktop.org desktop menus for LXDE";

    platforms = lib.platforms.linux;

  };

}
 
})