nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt6: backport fixes for weird list behaviors from 6.8.1

Browse Source 
Recommended by Plasma upstream.
This commit is contained in:
K900 2024-10-08 18:06:19 +03:00
parent 1e4c95f332
commit 5e1d980f8d
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/qt-6/default.nix
View File

@ -62,6 +62,13 @@ let
revert = true;
hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A=";
})
# Backport patch for https://bugs.kde.org/show_bug.cgi?id=493116
# FIXME: remove for 6.8.1
(fetchpatch2 {
url = "https://github.com/qt/qtbase/commit/2ea3abed0125d81ca4f3bacb9650db7314657332.patch";
hash = "sha256-mdTdwhJtebuLUQRo+y1XUrrzgqG9G7GvPQwvrXLycJI=";
})
];
};
env = callPackage ./qt-env.nix { };

12
pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
View File

@ -6,6 +6,7 @@
, stdenv
, lib
, pkgsBuildBuild
, fetchpatch2
}:
qtModule {
@ -19,6 +20,17 @@ qtModule {
../patches/0001-qtdeclarative-disable-qml-disk-cache.patch
# add version specific QML import path
../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch
# Backport patches for https://bugs.kde.org/show_bug.cgi?id=493116
# FIXME: remove for 6.8.1
(fetchpatch2 {
url = "https://github.com/qt/qtdeclarative/commit/3330731d0cb221477ab3d856db032126403ae6a0.patch";
hash = "sha256-XXXGJ7nVDpEG/6nr16L89J87tvutyc+YnQPQx9cRU+w=";
})
(fetchpatch2 {
url = "https://github.com/qt/qtdeclarative/commit/2aefbca84d2f3dca2c2697f13710b6907c0c7e59.patch";
hash = "sha256-a/BX0gpW6juJbjDRo8OleMahOC6WWqreURmYZNiGm5c=";
})
];
cmakeFlags = [