gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deepin: resolve compilation issues on qt 6.9 (#398294)

Browse Source
This commit is contained in:
rewine
2025-04-14 09:13:47 +08:00
committed by GitHub
parent 908a512fd3 6579406d61
commit 89dbed5363
9 changed files with 61 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/deepin/core/dde-shell/default.nix
+9 -2
View File
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
extra-cmake-modules,
pkg-config,
@@ -23,17 +24,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dde-shell";
version = "1.0.9";
version = "1.0.10";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dde-shell";
rev = finalAttrs.version;
hash = "sha256-Gko1fFut5zWH/L6X5hEe5OZBjRIbKWIrrjjhh2wrsCg=";
hash = "sha256-0nyTvSIJglx8raehPi6pYfQcxIjsCAaD1hVbuGvtfY8=";
};
patches = [
./fix-path-for-nixos.diff
(fetchpatch {
name = "resolve-compilation-issues-on-Qt-6_9.patch";
url = "https://github.com/linuxdeepin/dde-shell/commit/936d62a2c20398b9ca6ae28f9101dd288c8b1678.patch";
hash = "sha256-u5TcPy2kZsOLGUgjTGZ5JX3mWnr/rOQ3SWBRyjWEiw4=";
})
];
postPatch = ''
pkgs/desktops/deepin/library/dtk6core/default.nix
+8 -2
View File
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
doxygen,
@@ -14,18 +15,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtk6core";
version = "6.0.24";
version = "6.0.33";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dtk6core";
rev = finalAttrs.version;
hash = "sha256-51TvPQy0b/8kkBs0e3q1B53mEAKHpAYPBla4h1k616c=";
hash = "sha256-AmGQoDt9qp0m0iV7WrR16DPTt80Y5leRUVXPOtHeugs=";
};
patches = [
./fix-pkgconfig-path.patch
./fix-pri-path.patch
(fetchpatch {
name = "resolve-compilation-issues-on-Qt-6_9.patch";
url = "https://github.com/linuxdeepin/dtkcore/commit/8f523a8b387a006b942268e2143d0d58c574f7c5.patch";
hash = "sha256-x8BfWCdsz8Bf/sAM7PymZWqlPyEabwP0e6ybfz/2oZ4=";
})
];
postPatch = ''
pkgs/desktops/deepin/library/dtk6declarative/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtk6declarative";
version = "6.0.24";
version = "6.0.33";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dtk6declarative";
rev = finalAttrs.version;
hash = "sha256-i6gkVWs6CQC6i6H6lfrWNYT76fFBc8ECZ1ePvXQ7j8E=";
hash = "sha256-hFH5XCeNs31hslaPMyuXBLe0Du3s6STs9kltwL+/F1s=";
};
patches = [
pkgs/desktops/deepin/library/dtk6gui/default.nix
+8 -2
View File
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
doxygen,
@@ -12,18 +13,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtk6gui";
version = "6.0.24";
version = "6.0.33";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dtk6gui";
rev = finalAttrs.version;
hash = "sha256-Ybi68lTSUJpAipx92JF7wj6y+GTYDodJKRCVFhfnBvQ=";
hash = "sha256-ZnRhrlgrQ7Vusod2diFwVEVnNGHYNq5Ij12GbW6LXWc=";
};
patches = [
./fix-pkgconfig-path.patch
./fix-pri-path.patch
(fetchpatch {
name = "resolve-compilation-issues-on-Qt-6_9.patch";
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/ae64c77a73cdea069579ecf6833be63635237180/qt-6.9.patch";
hash = "sha256-45L3ZQ9Hv7tLdDjtazLhVl8XgKBtcHL3CT2nw6GkqgM=";
})
];
postPatch = ''
pkgs/desktops/deepin/library/dtk6log/default.nix
+11 -2
View File
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
qt6Packages,
@@ -12,15 +13,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtk6log";
version = "0.0.1";
version = "0.0.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dtk6log";
rev = finalAttrs.version;
hash = "sha256-R+jxlS8/FXUxnnzIDIePU2NwwNQU624n++E3q3oElco=";
hash = "sha256-uPuka+uVCcl2sBMr1SpgqLpcIqZm6BDZyGd7FOraHVM=";
};
patches = [
(fetchpatch {
name = "resolve-compilation-issues-on-Qt-6_9.patch";
url = "https://github.com/linuxdeepin/dtklog/commit/ab7ed5aa8433c726470f2aecc1d99f118eae8b63.patch";
hash = "sha256-QK4MOAzTZjjK5qfmzguXAgHO9guMCRN/5y+llBSY2vk=";
})
];
nativeBuildInputs = [
cmake
pkg-config
pkgs/desktops/deepin/library/dtk6widget/default.nix
+8 -2
View File
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
doxygen,
@@ -13,18 +14,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtk6widget";
version = "6.0.24";
version = "6.0.33";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "dtk6widget";
rev = finalAttrs.version;
hash = "sha256-aDuLybIEzF8ATzH6vkN2SS/yn1eAc2WooNZxeQyH2QM=";
hash = "sha256-CSsN/6Geban/l6Rp5NuxIUomgTlqXyvttafTbjZIwSc=";
};
patches = [
./fix-pkgconfig-path.patch
./fix-pri-path.patch
(fetchpatch {
name = "resolve-compilation-issues-on-Qt-6_9.patch";
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/raw/ce8f89bbed6ebd4659c7f964f158857ebfdee01c/qt-6.9.patch";
hash = "sha256-LlFBXuoPxuszO9bkXK1Cy6zMTSnlh33UnmlKMJk3QH0=";
})
];
postPatch = ''
pkgs/desktops/deepin/library/dtkcommon/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "dtkcommon";
version = "5.6.32";
version = "5.7.13";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-e+8kG9bB6iby2RgD8jn75GyefLRHNnjD+n04hXbi5ec=";
hash = "sha256-yQKkqHL5W2mHPE3zchAwtWUH55zrCEJwcVWCheC0rW4=";
};
nativeBuildInputs = [ cmake ];
pkgs/desktops/deepin/library/qt6integration/default.nix
+11 -2
View File
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
dtk6widget,
@@ -11,15 +12,23 @@
stdenv.mkDerivation rec {
pname = "qt6integration";
version = "6.0.24";
version = "6.0.33";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-J0HKtxnQCizHFf2VR9srS/CxWqAkczia7kDWxvGzKsw=";
hash = "sha256-fxeXjUn1hJUE1Le24sqVEvKBX9Uo8qUVjr3sfz/5cQQ=";
};
patches = [
(fetchpatch {
name = "resolve-compilation-issues-on-Qt-6_9.patch";
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-qt6integration/-/raw/e85e6836919d8e8424e800d7d4c8681bb23c29f9/qt-6.9.patch";
hash = "sha256-GJH25cOEcA5Zep6FABwlRXU7HfpgMXNJzsbmWQdzx+Y=";
})
];
nativeBuildInputs = [
cmake
pkg-config
pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "qt6platform-plugins";
version = "6.0.24";
version = "6.0.33";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-Ih3VlEv2hl8y/Cc5uI8gQFgIVvcCaHUhHAudNOSqfs4=";
hash = "sha256-uQ/dfk/HEvngTjHDLQOg965Jy+fH2YNfhKwXB+1BoUM=";
};
postUnpack = ''