Unverified Commit d71a6bf8 authored by José Romildo Malaquias's avatar José Romildo Malaquias Committed by GitHub
Browse files

Update LXQt to version 2.2.0 (#406875)

parents 60783b25 ad664122
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@

stdenv.mkDerivation rec {
  pname = "libdbusmenu-lxqt";
  version = "0.2.0";
  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "lxqt";
    repo = pname;
    rev = version;
    hash = "sha256-OF12t08hOuDsl80n4lXO3AFCf29f01eDpoRcbXmI4+I=";
    hash = "sha256-PqX8ShSu3CYN9XIRp6IjVmr/eKH+oLNhXvwiudUH660=";
  };

  nativeBuildInputs = [
+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
  qttools,
  wrapQtAppsHook,
  gitUpdater,
  version ? "2.1.0",
  version ? "2.2.0",
  qtx11extras ? null,
}:

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
    hash =
      {
        "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
        "2.1.0" = "sha256-yH3lyOpmDWjA3bV6msjw7fShs1HnAFOmkGer2Z9N/Tg=";
        "2.2.0" = "sha256-xLXHwrcMJ8PObZ2qWVZTf9FREcjUi5qtcCJgNHj391Q=";
      }
      ."${version}";
  };
+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@

stdenv.mkDerivation rec {
  pname = "liblxqt";
  version = "2.1.0";
  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "lxqt";
    repo = pname;
    rev = version;
    hash = "sha256-90t7jukm2vNfkgZ3326UDMXNzwJ+FIVEF3kNZ2SgNN8=";
    hash = "sha256-04t6wssTuSKlqSuUTmcDU66NVGikWh7p2irWBngN494=";
  };

  nativeBuildInputs = [
+2 −12
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch,
  cmake,
  qtbase,
  qtsvg,
  lxqt-build-tools,
  wrapQtAppsHook,
  gitUpdater,
  version ? "4.1.0",
  version ? "4.2.0",
}:

stdenv.mkDerivation rec {
@@ -23,20 +22,11 @@ stdenv.mkDerivation rec {
    hash =
      {
        "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
        "4.1.0" = "sha256-Efn08a8MkR459Ww0WiEb5GXKgQzJwKupIdL2TySpivE=";
        "4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI=";
      }
      ."${version}";
  };

  # Fix build with Qt 6.9
  # FIXME: remove in next release
  patches = lib.optionals (version == "4.1.0") [
    (fetchpatch {
      url = "https://github.com/lxqt/libqtxdg/commit/35ce74f1510a9f41b2aff82fd1eda63014c3fe2b.patch";
      hash = "sha256-udO3RQkzkcDBCxMNTIsORlDCLsZrxCbi0dXCBRuoQQQ=";
    })
  ];

  nativeBuildInputs = [
    cmake
    lxqt-build-tools
+2 −2
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@

stdenv.mkDerivation rec {
  pname = "lximage-qt";
  version = "2.1.1";
  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "lxqt";
    repo = pname;
    rev = version;
    hash = "sha256-Y9lBXEROC4LIl1M7js0TvJBBNyO06qCWpHxvQjcYPhc=";
    hash = "sha256-4j/5z+kePFXubYXAbIaWYVU+plJv1xEpHHI1IXqbQog=";
  };

  nativeBuildInputs = [
Loading