lxqt.libqtxdg: 4.2.0 -> 4.3.0
Diff: https://github.com/lxqt/libqtxdg/compare/4.2.0...4.3.0
This commit is contained in:
@@ -2,14 +2,13 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
|
||||||
cmake,
|
cmake,
|
||||||
qtbase,
|
qtbase,
|
||||||
qtsvg,
|
qtsvg,
|
||||||
lxqt-build-tools,
|
lxqt-build-tools,
|
||||||
wrapQtAppsHook,
|
wrapQtAppsHook,
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
version ? "4.2.0",
|
version ? "4.3.0",
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
@@ -23,21 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
hash =
|
hash =
|
||||||
{
|
{
|
||||||
"3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
|
"3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
|
||||||
"4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI=";
|
"4.3.0" = "sha256-aec+NjKkaH8dI0cFVxGehdRGO2aH6BD+aix+IvD+2LI=";
|
||||||
}
|
}
|
||||||
."${finalAttrs.version}";
|
."${finalAttrs.version}";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optionals (finalAttrs.version == "4.2.0") [
|
|
||||||
# fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313)
|
|
||||||
# TODO: drop when upgrading beyond version 4.2.0
|
|
||||||
(fetchpatch {
|
|
||||||
name = "cmake-fix-build-with-Qt-6.10.patch";
|
|
||||||
url = "https://github.com/lxqt/libqtxdg/commit/b01a024921acdfd5b0e97d5fda2933c726826e99.patch";
|
|
||||||
hash = "sha256-njpn6pU9BHlfYfkw/jEwh8w3Wo1F8MlRU8iQB+Tz2zU=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
lxqt-build-tools
|
lxqt-build-tools
|
||||||
|
|||||||
Reference in New Issue
Block a user