mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
Reapply "kdePackages: Plasma 6.3.4 -> 6.3.5"
This reverts commit 54ef2427d2.
This commit is contained in:
@@ -3,24 +3,10 @@
|
|||||||
qtbase,
|
qtbase,
|
||||||
qtsvg,
|
qtsvg,
|
||||||
libsForQt5,
|
libsForQt5,
|
||||||
fetchpatch,
|
|
||||||
}:
|
}:
|
||||||
mkKdeDerivation {
|
mkKdeDerivation {
|
||||||
pname = "breeze";
|
pname = "breeze";
|
||||||
|
|
||||||
# Backport fixes for Qt 6.9
|
|
||||||
# FIXME: remove in 6.3.5 / 6.4
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://invent.kde.org/plasma/breeze/-/commit/098ad3facb3d76fe4476424f1b7bf3c9c2c1b142.patch";
|
|
||||||
hash = "sha256-o9XrhYJIvygZ6nfcDKL22jxP7eaHeN3RGBixiOZh9O8=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://invent.kde.org/plasma/breeze/-/commit/e2f16562b64c63b623def44476eadc635a82c7de.patch";
|
|
||||||
hash = "sha256-hPbLEfD3mhPfpoDfVUolUZ4+Pip5VNj8di/0ZDj7Jzw=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
"dev"
|
"dev"
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
pipewire,
|
pipewire,
|
||||||
krunner,
|
krunner,
|
||||||
python3,
|
python3,
|
||||||
fetchpatch,
|
|
||||||
}:
|
}:
|
||||||
mkKdeDerivation {
|
mkKdeDerivation {
|
||||||
pname = "kwin";
|
pname = "kwin";
|
||||||
@@ -30,13 +29,6 @@ mkKdeDerivation {
|
|||||||
./0003-plugins-qpa-allow-using-nixos-wrapper.patch
|
./0003-plugins-qpa-allow-using-nixos-wrapper.patch
|
||||||
./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
|
./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
|
||||||
./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
|
./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
|
||||||
|
|
||||||
# Backport crash fix
|
|
||||||
# FIXME: remove in 6.3.5
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://invent.kde.org/plasma/kwin/-/commit/93bf2f98ae22e654d997c7140b7fe9936fa3f2d3.patch";
|
|
||||||
hash = "sha256-Jaa7IVuYMfxzUv0y2rUo5hdYavjaUkEW9/yteL5katE=";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
fuse,
|
fuse,
|
||||||
cryfs,
|
cryfs,
|
||||||
encfs,
|
encfs,
|
||||||
fetchpatch,
|
|
||||||
}:
|
}:
|
||||||
mkKdeDerivation {
|
mkKdeDerivation {
|
||||||
pname = "plasma-vault";
|
pname = "plasma-vault";
|
||||||
@@ -16,13 +15,6 @@ mkKdeDerivation {
|
|||||||
./0002-cryfs-path.patch
|
./0002-cryfs-path.patch
|
||||||
./0003-fusermount-path.patch
|
./0003-fusermount-path.patch
|
||||||
./0004-gocryptfs-path.patch
|
./0004-gocryptfs-path.patch
|
||||||
|
|
||||||
# Fix build with Qt 6.9
|
|
||||||
# FIXME: remove in 6.3.5
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://invent.kde.org/plasma/plasma-vault/-/commit/a982e58679caa583ceb4cc883d1c1923dab54db9.patch";
|
|
||||||
hash = "sha256-Khws1fvVTFEgwMDGt7P52PHboa+4kq6g792kFaT5ceU=";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
CXXFLAGS = [
|
CXXFLAGS = [
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
qttools,
|
qttools,
|
||||||
qqc2-breeze-style,
|
qqc2-breeze-style,
|
||||||
gpsd,
|
gpsd,
|
||||||
fetchpatch,
|
|
||||||
}:
|
}:
|
||||||
mkKdeDerivation {
|
mkKdeDerivation {
|
||||||
pname = "plasma-workspace";
|
pname = "plasma-workspace";
|
||||||
@@ -33,13 +32,6 @@ mkKdeDerivation {
|
|||||||
# @QtBinariesDir@ only appears in the *removed* lines of the diff
|
# @QtBinariesDir@ only appears in the *removed* lines of the diff
|
||||||
QtBinariesDir = null;
|
QtBinariesDir = null;
|
||||||
})
|
})
|
||||||
|
|
||||||
# Backport patch recommended by upstream
|
|
||||||
# FIXME: remove in 6.3.5
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/47d502353720004fa2d0e7b0065994b75b3e0ded.patch";
|
|
||||||
hash = "sha256-wt0ZIF4zcEOmP0o4ZcjBYxVjr2hVUlOKVJ8SMNSYt68=";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|||||||
Reference in New Issue
Block a user